build operator last (#327)

* build operator last

* dummy change to trigger gcsfuse rebuild

* dummy change to trigger workflow

* Automated commit: update images.

Author: sroettger

.github/workflows/update-images.yaml

@@ -34,7 +34,7 @@ jobs:
       certbot-digest: ${{ steps.push.outputs.certbot-digest }}
     strategy:
       matrix:
-        image: ["kctf-operator", "challenge", "healthcheck", "gcsfuse", "certbot"]
+        image: ["challenge", "healthcheck", "gcsfuse", "certbot", "kctf-operator"]
     steps:
     - uses: actions/checkout@v2
       with:
@@ -44,7 +44,7 @@ jobs:
       name: Check for modified paths
       run: |
         if [ "${{ matrix.image }}" == "kctf-operator" ]; then
-          PATHS=(".github/workflows/update-images.yaml" "kctf-operator/*" "kctf-operator/build/**" "kctf-operator/cmd/**" "kctf-operator/pkg/**" "kctf-operator/version/**" "docker-images/gcsfuse/**" "docker-images/certbot/**")
+          PATHS=(".github/workflows/update-images.yaml" "kctf-operator/*" "kctf-operator/build/**" "kctf-operator/cmd/**" "kctf-operator/pkg/**" "kctf-operator/version/**")
         else
           PATHS=(".github/workflows/update-images.yaml" "docker-images/${{ matrix.image }}/**")
         fi

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:035cc67b4dfd74077a8a305321b17854481308dec5af28fc8ad1d6c75d729340
+FROM gcr.io/kctf-docker/challenge@sha256:56f7dddff69d08d4d19f4921c724d438cf4d59e434c601f9776fd818368b7107
 
 COPY --from=chroot / /chroot
 

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:18fe7058d40100b7eb2eca0a274fc2f41403d44706ae969bcef01400b3bfde64
+FROM gcr.io/kctf-docker/healthcheck@sha256:57c1002a2a8b8741bd2f6b9ee3e1da2c5b3872459b789255895bb8cdf297b911
 
 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/
 

dist/challenge-templates/web/challenge/Dockerfile

@@ -40,7 +40,7 @@ COPY web-servers /web-servers
 
 COPY flag /
 
-FROM gcr.io/kctf-docker/challenge@sha256:035cc67b4dfd74077a8a305321b17854481308dec5af28fc8ad1d6c75d729340
+FROM gcr.io/kctf-docker/challenge@sha256:56f7dddff69d08d4d19f4921c724d438cf4d59e434c601f9776fd818368b7107
 
 RUN apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends tzdata apache2 \

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:18fe7058d40100b7eb2eca0a274fc2f41403d44706ae969bcef01400b3bfde64
+FROM gcr.io/kctf-docker/healthcheck@sha256:57c1002a2a8b8741bd2f6b9ee3e1da2c5b3872459b789255895bb8cdf297b911
 
 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/
 

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:035cc67b4dfd74077a8a305321b17854481308dec5af28fc8ad1d6c75d729340
+FROM gcr.io/kctf-docker/challenge@sha256:56f7dddff69d08d4d19f4921c724d438cf4d59e434c601f9776fd818368b7107
 
 RUN apt-get update && apt-get install -y gnupg2
 

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:18fe7058d40100b7eb2eca0a274fc2f41403d44706ae969bcef01400b3bfde64
+FROM gcr.io/kctf-docker/healthcheck@sha256:57c1002a2a8b8741bd2f6b9ee3e1da2c5b3872459b789255895bb8cdf297b911
 
 COPY healthcheck_loop.sh healthcheck.py healthz_webserver.py /home/user/
 

dist/resources/operator.yaml

@@ -16,7 +16,7 @@ spec:
       serviceAccountName: kctf-operator
       containers:
         - name: kctf-operator
-          image: gcr.io/kctf-docker/kctf-operator@sha256:ef79e76158b7255ac408ce785c664b4e3ca6490d590a71f6e28c805d6a9f6c73
+          image: gcr.io/kctf-docker/kctf-operator@sha256:a42991dd7d2d4267815572912ce0410094d8a83af50df1f12b86616de890c9ac
           command:
           - kctf-operator
           imagePullPolicy: Always

docker-images/gcsfuse/Dockerfile

@@ -1,6 +1,8 @@
 FROM ubuntu:20.04
+
 RUN apt-get update && apt-get install -y wget fuse
 RUN wget -q https://github.com/GoogleCloudPlatform/gcsfuse/releases/download/v0.35.1/gcsfuse_0.35.1_amd64.deb && dpkg -i gcsfuse_0.35.1_amd64.deb
 RUN mkdir -p /mnt/disks/gcs
+
 CMD test -f /config/gcs_bucket &&\
     gcsfuse --foreground --debug_fuse --debug_gcs --stat-cache-ttl 0 -type-cache-ttl 0 -o allow_other -o nonempty --file-mode 0777 --dir-mode 0777 --uid 1000 --gid 1000 "$(cat /config/gcs_bucket)" /mnt/disks/gcs

kctf-operator/pkg/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:b300d156df46be2615822f4f086b94a19f5101690948a9135be57aadd501ccf6"
-const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:fecd90f412a624b36e76a15c5dfb6648f357dc9cc523b77fa58ad97b3d37a5c9"
+const DOCKER_CERTBOT_IMAGE = "gcr.io/kctf-docker/certbot@sha256:82be4c84fad2a11a6b92aa472cab2dd7018178ab89f27d4d77f46997ff539229"
+const DOCKER_GCSFUSE_IMAGE = "gcr.io/kctf-docker/gcsfuse@sha256:560897fba48dffba06e3a03c0b959bebc5e8bcb01d51e71bce75e05d0ad71119"
 
 // .. ^^ ........................... ^^ ..
 // == || These are set by automation || ==