Skip to content

Commit

Permalink
Merge pull request #186 from MaibornWolff/dev
Browse files Browse the repository at this point in the history
chore: merge to main for release 2024_08
  • Loading branch information
StefanFl authored Aug 20, 2024
2 parents 368b4b1 + 817460e commit 4b9d1a4
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
14 changes: 7 additions & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Python build stage
FROM python:3.12.4-alpine AS python-build-stage
FROM python:3.12.5-alpine AS python-build-stage

# Install gcc to be able to compile wheels for python packages
RUN apk add --no-cache gcc musl-dev python3-dev
Expand All @@ -10,9 +10,9 @@ COPY docker/requirements.txt .
RUN pip wheel --wheel-dir /usr/src/app/wheels -r ./requirements.txt

# Go build stage for KICS
FROM golang:1.22.5-alpine AS go-build-stage
FROM golang:1.23.0-alpine AS go-build-stage

ARG KICS_VERSION=2.1.1
ARG KICS_VERSION=2.1.2

# Install kics from GitHub
WORKDIR /usr/local/kics
Expand All @@ -22,12 +22,12 @@ RUN wget --no-verbose https://github.com/Checkmarx/kics/archive/refs/tags/v${KIC
&& go build -o ./bin/kics cmd/console/main.go

# Python run stage
FROM python:3.12.4-alpine AS python-run-stage
FROM python:3.12.5-alpine AS python-run-stage

ARG GITLEAKS_VERSION=8.18.4
ARG GRYPE_VERSION=0.79.3
ARG KICS_VERSION=2.1.1
ARG TRIVY_VERSION=0.53.0
ARG GRYPE_VERSION=0.79.6
ARG KICS_VERSION=2.1.2
ARG TRIVY_VERSION=0.54.1
ARG TFSEC_VERSION=1.28.10

ARG CREATED
Expand Down
4 changes: 2 additions & 2 deletions docker/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ bandit-sarif-formatter==1.1.1 # https://github.com/microsoft/bandit-sarif-forma

# Checkov
# ----------------------------------------------------------------
checkov==3.2.194 # https://github.com/bridgecrewio/checkov
checkov==3.2.234 # https://github.com/bridgecrewio/checkov

# Semgrep
# ----------------------------------------------------------------
semgrep==1.80.0 # https://github.com/returntocorp/semgrep
semgrep==1.85.0 # https://github.com/returntocorp/semgrep

# CryptoLyzer
# ----------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
PyYAML==6.0.1
PyYAML==6.0.2

0 comments on commit 4b9d1a4

Please sign in to comment.