From 818e3b6373ff15352987865a54a8bc5b5da0768d Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Wed, 17 May 2023 08:24:31 +0000 Subject: [PATCH] Automated commit: update images. --- dist/challenge-templates/pwn/challenge/Dockerfile | 2 +- dist/challenge-templates/pwn/healthcheck/Dockerfile | 2 +- dist/challenge-templates/web/challenge/Dockerfile | 2 +- dist/challenge-templates/web/healthcheck/Dockerfile | 2 +- dist/challenge-templates/xss-bot/challenge/Dockerfile | 2 +- dist/challenge-templates/xss-bot/healthcheck/Dockerfile | 2 +- dist/resources/operator.yaml | 2 +- kctf-operator/resources/constants.go | 4 ++-- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/challenge-templates/pwn/challenge/Dockerfile b/dist/challenge-templates/pwn/challenge/Dockerfile index f40f8dbc..973a386b 100644 --- a/dist/challenge-templates/pwn/challenge/Dockerfile +++ b/dist/challenge-templates/pwn/challenge/Dockerfile @@ -18,7 +18,7 @@ RUN /usr/sbin/useradd --no-create-home -u 1000 user COPY flag / COPY chal /home/user/ -FROM gcr.io/kctf-docker/challenge@sha256:d884e54146b71baf91603d5b73e563eaffc5a42d494b1e32341a5f76363060fb +FROM gcr.io/kctf-docker/challenge@sha256:0f7d757bcda470c3bbc063606335b915e03795d72ba1d8fdb6f0f9ff3757364f COPY --from=chroot / /chroot diff --git a/dist/challenge-templates/pwn/healthcheck/Dockerfile b/dist/challenge-templates/pwn/healthcheck/Dockerfile index cf2ef891..2df56306 100644 --- a/dist/challenge-templates/pwn/healthcheck/Dockerfile +++ b/dist/challenge-templates/pwn/healthcheck/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/kctf-docker/healthcheck@sha256:abe5bc78f1eed01a050bc9efccde279aef560888598c0a04547b383a1429c6d4 +FROM gcr.io/kctf-docker/healthcheck@sha256:6709709a8cfd6e2d743c86d58398c00ca4eb26befd3b1a0a629ab35f91e98ef0 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/ diff --git a/dist/challenge-templates/web/challenge/Dockerfile b/dist/challenge-templates/web/challenge/Dockerfile index c7ae21a2..309b1818 100644 --- a/dist/challenge-templates/web/challenge/Dockerfile +++ b/dist/challenge-templates/web/challenge/Dockerfile @@ -40,7 +40,7 @@ COPY web-servers /web-servers COPY flag / -FROM gcr.io/kctf-docker/challenge@sha256:d884e54146b71baf91603d5b73e563eaffc5a42d494b1e32341a5f76363060fb +FROM gcr.io/kctf-docker/challenge@sha256:0f7d757bcda470c3bbc063606335b915e03795d72ba1d8fdb6f0f9ff3757364f RUN apt-get update \ && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends tzdata apache2 \ diff --git a/dist/challenge-templates/web/healthcheck/Dockerfile b/dist/challenge-templates/web/healthcheck/Dockerfile index cf2ef891..2df56306 100644 --- a/dist/challenge-templates/web/healthcheck/Dockerfile +++ b/dist/challenge-templates/web/healthcheck/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/kctf-docker/healthcheck@sha256:abe5bc78f1eed01a050bc9efccde279aef560888598c0a04547b383a1429c6d4 +FROM gcr.io/kctf-docker/healthcheck@sha256:6709709a8cfd6e2d743c86d58398c00ca4eb26befd3b1a0a629ab35f91e98ef0 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/ diff --git a/dist/challenge-templates/xss-bot/challenge/Dockerfile b/dist/challenge-templates/xss-bot/challenge/Dockerfile index 75cc4dbc..46acfa1e 100644 --- a/dist/challenge-templates/xss-bot/challenge/Dockerfile +++ b/dist/challenge-templates/xss-bot/challenge/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/kctf-docker/challenge@sha256:d884e54146b71baf91603d5b73e563eaffc5a42d494b1e32341a5f76363060fb +FROM gcr.io/kctf-docker/challenge@sha256:0f7d757bcda470c3bbc063606335b915e03795d72ba1d8fdb6f0f9ff3757364f RUN apt-get update && apt-get install -y gnupg2 wget diff --git a/dist/challenge-templates/xss-bot/healthcheck/Dockerfile b/dist/challenge-templates/xss-bot/healthcheck/Dockerfile index cf2ef891..2df56306 100644 --- a/dist/challenge-templates/xss-bot/healthcheck/Dockerfile +++ b/dist/challenge-templates/xss-bot/healthcheck/Dockerfile @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/kctf-docker/healthcheck@sha256:abe5bc78f1eed01a050bc9efccde279aef560888598c0a04547b383a1429c6d4 +FROM gcr.io/kctf-docker/healthcheck@sha256:6709709a8cfd6e2d743c86d58398c00ca4eb26befd3b1a0a629ab35f91e98ef0 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/ diff --git a/dist/resources/operator.yaml b/dist/resources/operator.yaml index 0c8d1cea..7933bbcd 100644 --- a/dist/resources/operator.yaml +++ b/dist/resources/operator.yaml @@ -4544,7 +4544,7 @@ spec: value: 0.0.0.0/0 - name: SECURITY_POLICY value: DISABLED - image: gcr.io/kctf-docker/kctf-operator@sha256:fe3b80bccd86e90e154005576438864bed33159059a7ab67d1cb42896daef092 + image: gcr.io/kctf-docker/kctf-operator@sha256:ad8cf85ab93a9cfbd8fa1ccc221851933a3e6ef554f18041c581b0f72b33cae2 livenessProbe: httpGet: path: /healthz diff --git a/kctf-operator/resources/constants.go b/kctf-operator/resources/constants.go index 45ebc4ac..1eca7825 100644 --- a/kctf-operator/resources/constants.go +++ b/kctf-operator/resources/constants.go @@ -5,8 +5,8 @@ package resources // == || These are set by automation || == // .. vv ........................... vv .. -const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:d03e0b8a9f3200298b94b43b2432df17cd892a2d17602d395035b0036f794752" -const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:1411553eda7429a510056c592c56a16cd47d3e4c868a46e737997e0fe3026fb3" +const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:5cdc993bade510f0ffbad7d1e13d9d586ae5703aaf9b4111d0299a9e5e4bdcac" +const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:90d42ec41823b40bde0d04820ae757a67eb9fe1c100f44487d867c4042b82655" // .. ^^ ........................... ^^ .. // == || These are set by automation || ==