From 88e755172a47b847dc890783c30bea022c671db2 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 09:56:23 -0800 Subject: [PATCH 1/9] add python tooling --- images/stackrox-test.Dockerfile | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index b768c2c5..97d517b0 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -59,6 +59,15 @@ RUN gke-gcloud-auth-plugin --version # Update PATH for Postgres14 ENV PATH=$PATH:/usr/pgsql-14/bin +# Add python development tooling +PYCODESTYLE_VERSION=2.11.1 +AUTOPEP8_VERSION=2.0.4 +PYLINT_VERSION=3.0.2 +RUN set -ex \ + && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ + autopep8="${AUTOPEP8_VERSION}" \ + pylint="${PYLINT_VERSION}" + # Install bats RUN set -ex \ && npm install -g bats@1.10.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \ @@ -156,6 +165,15 @@ RUN set -ex \ && rm "vault_${VAULT_VERSION}_linux_amd64.zip" \ && vault --version +# Add python development tooling +PYCODESTYLE_VERSION=2.11.1 +AUTOPEP8_VERSION=2.0.4 +PYLINT_VERSION=3.0.2 +RUN set -ex \ + && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ + autopep8="${AUTOPEP8_VERSION}" \ + pylint="${PYLINT_VERSION}" + RUN \ mv /bin/bash /bin/real-bash && \ mv /bin/bash-wrapper /bin/bash From 2a7a57988e9dc1ca1f93120f6b3c2f44356cdd24 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:04:07 -0800 Subject: [PATCH 2/9] fix --- images/stackrox-test.Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index 97d517b0..bdd7914a 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -60,9 +60,9 @@ RUN gke-gcloud-auth-plugin --version ENV PATH=$PATH:/usr/pgsql-14/bin # Add python development tooling -PYCODESTYLE_VERSION=2.11.1 -AUTOPEP8_VERSION=2.0.4 -PYLINT_VERSION=3.0.2 +ARG PYCODESTYLE_VERSION=2.11.1 +ARG AUTOPEP8_VERSION=2.0.4 +ARG PYLINT_VERSION=3.0.2 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ autopep8="${AUTOPEP8_VERSION}" \ @@ -166,9 +166,9 @@ RUN set -ex \ && vault --version # Add python development tooling -PYCODESTYLE_VERSION=2.11.1 -AUTOPEP8_VERSION=2.0.4 -PYLINT_VERSION=3.0.2 +ARG PYCODESTYLE_VERSION=2.11.1 +ARG AUTOPEP8_VERSION=2.0.4 +ARG PYLINT_VERSION=3.0.2 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ autopep8="${AUTOPEP8_VERSION}" \ From 73fdb83b1e1d0e9c9984d20770bda2464d9d3199 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:06:56 -0800 Subject: [PATCH 3/9] match --- images/scanner-build.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/scanner-build.Dockerfile b/images/scanner-build.Dockerfile index 3d5b1fc5..ec85b581 100644 --- a/images/scanner-build.Dockerfile +++ b/images/scanner-build.Dockerfile @@ -35,6 +35,7 @@ ARG OSSLS_SHA256=afdec2fa63b27ced4aeb3297399d45b0f06861e6ebc8cb2431b9653b7f11332 RUN fetch --repo="https://github.com/stackrox/ossls" --tag="${OSSLS_VERSION}" --release-asset="ossls_linux_amd64" . && \ echo "${OSSLS_SHA256} *ossls_linux_amd64" | sha256sum -c - && \ install ossls_linux_amd64 /usr/bin/ossls && \ + rm ossls_linux_amd64 && \ ossls version WORKDIR /go/src/github.com/stackrox/scanner From 0429cd0765fc3c70e80b3ab9da539f3df68f3f43 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:09:25 -0800 Subject: [PATCH 4/9] unused arg --- .github/workflows/build.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 7ee5b94f..67863b67 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -79,7 +79,6 @@ jobs: ref: ${{ github.event.pull_request.head.sha }} - uses: ./.github/actions/build-and-push-image with: - dockerfile-path: images/scanner-build.Dockerfile image-flavor: "scanner-build" build-and-push-scanner-test: From 905154b4ee1c1dea5f08ab20e600ec5e291e350b Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:10:11 -0800 Subject: [PATCH 5/9] fix --- images/stackrox-test.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index bdd7914a..8416fbbd 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -65,8 +65,8 @@ ARG AUTOPEP8_VERSION=2.0.4 ARG PYLINT_VERSION=3.0.2 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ - autopep8="${AUTOPEP8_VERSION}" \ - pylint="${PYLINT_VERSION}" + autopep8=="${AUTOPEP8_VERSION}" \ + pylint=="${PYLINT_VERSION}" # Install bats RUN set -ex \ @@ -171,8 +171,8 @@ ARG AUTOPEP8_VERSION=2.0.4 ARG PYLINT_VERSION=3.0.2 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ - autopep8="${AUTOPEP8_VERSION}" \ - pylint="${PYLINT_VERSION}" + autopep8=="${AUTOPEP8_VERSION}" \ + pylint=="${PYLINT_VERSION}" RUN \ mv /bin/bash /bin/real-bash && \ From 0bace1b82bbc21bafe5b3f2c55f802a12ac3ed01 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:27:46 -0800 Subject: [PATCH 6/9] pin to centos versions --- images/stackrox-test.Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index 8416fbbd..61e8531d 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -60,7 +60,7 @@ RUN gke-gcloud-auth-plugin --version ENV PATH=$PATH:/usr/pgsql-14/bin # Add python development tooling -ARG PYCODESTYLE_VERSION=2.11.1 +ARG PYCODESTYLE_VERSION=2.10.0 ARG AUTOPEP8_VERSION=2.0.4 ARG PYLINT_VERSION=3.0.2 RUN set -ex \ @@ -166,7 +166,7 @@ RUN set -ex \ && vault --version # Add python development tooling -ARG PYCODESTYLE_VERSION=2.11.1 +ARG PYCODESTYLE_VERSION=2.10.0 ARG AUTOPEP8_VERSION=2.0.4 ARG PYLINT_VERSION=3.0.2 RUN set -ex \ From 09ff02b005bdf722503a7a4a87f612eb1cb60e23 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 10:56:02 -0800 Subject: [PATCH 7/9] gets --- images/stackrox-test.Dockerfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index 61e8531d..5632dfde 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -61,11 +61,9 @@ ENV PATH=$PATH:/usr/pgsql-14/bin # Add python development tooling ARG PYCODESTYLE_VERSION=2.10.0 -ARG AUTOPEP8_VERSION=2.0.4 -ARG PYLINT_VERSION=3.0.2 +ARG PYLINT_VERSION=2.13.9 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ - autopep8=="${AUTOPEP8_VERSION}" \ pylint=="${PYLINT_VERSION}" # Install bats @@ -167,11 +165,9 @@ RUN set -ex \ # Add python development tooling ARG PYCODESTYLE_VERSION=2.10.0 -ARG AUTOPEP8_VERSION=2.0.4 -ARG PYLINT_VERSION=3.0.2 +ARG PYLINT_VERSION=2.13.9 RUN set -ex \ && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ - autopep8=="${AUTOPEP8_VERSION}" \ pylint=="${PYLINT_VERSION}" RUN \ From 0aa20f230ac6ac9f1b1d651dc24197ad5aa69ec0 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Thu, 23 Nov 2023 11:06:26 -0800 Subject: [PATCH 8/9] libs --- images/stackrox-test.Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index 5632dfde..e9c57a96 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -40,6 +40,7 @@ RUN dnf update -y && \ lz4 \ openssl \ parallel \ + python3-devel \ unzip \ xmlstarlet \ xz \ From 75cd4809e163581d4bc820aecaa98b9769569eb4 Mon Sep 17 00:00:00 2001 From: Gavin Jefferies Date: Tue, 28 Nov 2023 07:38:51 -0800 Subject: [PATCH 9/9] oooooopsie --- images/stackrox-test.Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile index e9c57a96..cdcdb6ac 100644 --- a/images/stackrox-test.Dockerfile +++ b/images/stackrox-test.Dockerfile @@ -60,13 +60,6 @@ RUN gke-gcloud-auth-plugin --version # Update PATH for Postgres14 ENV PATH=$PATH:/usr/pgsql-14/bin -# Add python development tooling -ARG PYCODESTYLE_VERSION=2.10.0 -ARG PYLINT_VERSION=2.13.9 -RUN set -ex \ - && pip3 install pycodestyle=="${PYCODESTYLE_VERSION}" \ - pylint=="${PYLINT_VERSION}" - # Install bats RUN set -ex \ && npm install -g bats@1.10.0 bats-support@0.3.0 bats-assert@2.0.0 tap-junit \