From 8db0890ba7472ff2fb4ba7d8bc38d1b22cd0c57c Mon Sep 17 00:00:00 2001 From: Andy Tinkham Date: Tue, 12 Jul 2022 13:01:04 -0500 Subject: [PATCH 1/2] Update base images Signed-off-by: Andy Tinkham --- CHANGELOG.md | 6 ++++++ bin/test-workflow/test_app_summon/Dockerfile.builder | 2 +- dev/Dockerfile.debug | 2 +- go.mod | 2 +- go.sum | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ce1f5a04..f6374722 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] +## [0.23.7] - 2022-07-12 +### Changed +- Updated dev/Dockerfile.debug and test-workflow/test-app-summon/Dockerfile.builder + to new base images + [cyberark/conjur-authn-k8s-client#480](https://github.com/cyberark/conjur-authn-k8s-client/pull/480) + ## [0.23.6] - 2022-06-16 ### Security - Added replace statement for gopkg.in/yaml.v3 prior to v3.0.1 diff --git a/bin/test-workflow/test_app_summon/Dockerfile.builder b/bin/test-workflow/test_app_summon/Dockerfile.builder index b4043cf1..2a31bb09 100644 --- a/bin/test-workflow/test_app_summon/Dockerfile.builder +++ b/bin/test-workflow/test_app_summon/Dockerfile.builder @@ -1,4 +1,4 @@ -FROM ruby:3.0 +FROM ruby:3.1-slim-bullseye MAINTAINER CyberArk #---some useful tools for interactive usage---# diff --git a/dev/Dockerfile.debug b/dev/Dockerfile.debug index 13fd3ab1..274eb783 100644 --- a/dev/Dockerfile.debug +++ b/dev/Dockerfile.debug @@ -1,4 +1,4 @@ -FROM golang:1.17-stretch +FROM golang:1.18-bullseye # dlv for debugging RUN go get github.com/go-delve/delve/cmd/dlv diff --git a/go.mod b/go.mod index 4d86b660..7da8a188 100644 --- a/go.mod +++ b/go.mod @@ -18,4 +18,4 @@ require ( replace gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c => gopkg.in/yaml.v3 v3.0.1 // DO NOT EDIT: CHANGES TO THE BELOW LINE WILL BREAK AUTOMATED RELEASES -replace github.com/cyberark/conjur-opentelemetry-tracer => github.com/cyberark/conjur-opentelemetry-tracer latest \ No newline at end of file +replace github.com/cyberark/conjur-opentelemetry-tracer => github.com/cyberark/conjur-opentelemetry-tracer latest diff --git a/go.sum b/go.sum index e56014c2..50d291f3 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,8 @@ github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEe github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-336 h1:eyFRQDVVxjUqIO3lSGT6wH+GgIJHVmVxFZh6N1tWmUk= github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-336/go.mod h1:Uq08XFlzJrRf7KbQO6mmIlwMsL1PSeYcldj34F8yGEc= +github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-394 h1:Ffl+3eKkawBUtaRC2O0rTT3KGvr/NzaO6BB7HI0fly4= +github.com/cyberark/conjur-opentelemetry-tracer v0.0.1-394/go.mod h1:IU6D7QQezwoCi6GaKa+79ZrBNyJzFCbIAep0VrLHK6o= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= From 884685ebb566b4c519083b51a6014da94b9769da Mon Sep 17 00:00:00 2001 From: Andy Tinkham Date: Tue, 12 Jul 2022 15:07:48 -0500 Subject: [PATCH 2/2] Remove old Dockerfiles from test_app_summon Signed-off-by: Andy Tinkham --- CHANGELOG.md | 4 ++-- .../test_app_summon/Dockerfile.builder | 15 --------------- bin/test-workflow/test_app_summon/Dockerfile.oc | 13 ------------- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 bin/test-workflow/test_app_summon/Dockerfile.builder delete mode 100644 bin/test-workflow/test_app_summon/Dockerfile.oc diff --git a/CHANGELOG.md b/CHANGELOG.md index f6374722..474b704c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [0.23.7] - 2022-07-12 ### Changed -- Updated dev/Dockerfile.debug and test-workflow/test-app-summon/Dockerfile.builder - to new base images +- Updated dev/Dockerfile.debug and removed bin/test-workflow/test-app-summon/Dockerfile.builder + and bin/test-workflow/test-app-summon/Dockerfile.oc [cyberark/conjur-authn-k8s-client#480](https://github.com/cyberark/conjur-authn-k8s-client/pull/480) ## [0.23.6] - 2022-06-16 diff --git a/bin/test-workflow/test_app_summon/Dockerfile.builder b/bin/test-workflow/test_app_summon/Dockerfile.builder deleted file mode 100644 index 2a31bb09..00000000 --- a/bin/test-workflow/test_app_summon/Dockerfile.builder +++ /dev/null @@ -1,15 +0,0 @@ -FROM ruby:3.1-slim-bullseye -MAINTAINER CyberArk - -#---some useful tools for interactive usage---# -RUN apt-get update && \ - apt-get install -y --no-install-recommends curl - -#---install summon and summon-conjur---# -RUN curl -sSL https://raw.githubusercontent.com/cyberark/summon/master/install.sh \ - | env TMPDIR=$(mktemp -d) bash && \ - curl -sSL https://raw.githubusercontent.com/cyberark/summon-conjur/master/install.sh \ - | env TMPDIR=$(mktemp -d) bash -# as per https://github.com/cyberark/summon#linux -# and https://github.com/cyberark/summon-conjur#install -ENV PATH="/usr/local/lib/summon:${PATH}" diff --git a/bin/test-workflow/test_app_summon/Dockerfile.oc b/bin/test-workflow/test_app_summon/Dockerfile.oc deleted file mode 100644 index ae792365..00000000 --- a/bin/test-workflow/test_app_summon/Dockerfile.oc +++ /dev/null @@ -1,13 +0,0 @@ -FROM cyberark/demo-app:1.1.0 -ARG namespace -MAINTAINER CyberArk - -#---copy summon into image---# -COPY tmp.summon-conjur /usr/local/lib/summon/summon-conjur -COPY tmp.summon /usr/local/bin/summon - -#---copy secrets.yml into image---# -COPY tmp.$namespace.secrets.yml /etc/secrets.yml - -#---override entrypoint to wrap command with summon---# -ENTRYPOINT [ "summon", "--provider", "summon-conjur", "-f", "/etc/secrets.yml", "java", "-jar", "/app.jar"]