Rename images

.github/workflows/ci.yaml

@@ -101,12 +101,12 @@ jobs:
     steps:
     - name: Fetch sources
       uses: actions/checkout@v2
-    - name: Install nightly toolchain
+    - name: Install stable toolchain
       uses: actions-rs/toolchain@v1
       with:
         components: clippy,rustfmt
         override: "true"
-        toolchain: nightly
+        toolchain: stable
     - name: Setup cache
       uses: Swatinem/rust-cache@v1
     - id: cargo_udeps
@@ -123,7 +123,7 @@ jobs:
         mkdir -p ~/udeps
         cp $( which cargo-udeps ) ~/udeps
     - name: Run cargo-udeps
-      run: "\nexport PATH=~/udeps:$PATH  \ncargo udeps \n"
+      run: "\nexport PATH=~/udeps:$PATH\nexport RUSTC_BOOTSTRAP=1\ncargo udeps \n"
   rustfmt:
     name: rustfmt
     runs-on: ubuntu-20.04

Dockerfile

@@ -1,15 +1,15 @@
-FROM lukemathwalker/cargo-chef as build-plan
+FROM docker.io/lukemathwalker/cargo-chef as build-plan
 WORKDIR /app
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
-FROM lukemathwalker/cargo-chef as cache
+FROM docker.io/lukemathwalker/cargo-chef as cache
 WORKDIR /app
 COPY --from=build-plan /app/recipe.json recipe.json
 ARG EXTRA_ARGS=""
 RUN cargo chef cook ${EXTRA_ARGS} --recipe-path recipe.json
 
-FROM rust as build
+FROM docker.io/library/rust as build
 WORKDIR /app
 COPY . .
 COPY --from=cache /app/target target
@@ -31,7 +31,7 @@ ENTRYPOINT [ "/usr/local/bin/shim" ]
 EXPOSE 8001
 CMD [ "--port", "8001" ]
 
-FROM ubuntu:focal as strace-debug
+FROM docker.io/library/ubuntu:focal as strace-debug
 RUN apt update && apt install -y strace
 COPY --from=build /app/out/strace-debugger /usr/local/bin/debugger
 ENTRYPOINT [ "/usr/local/bin/debugger" ]

ci/config.yaml

@@ -1,5 +1,5 @@
 dockerImages:
-  - jjs-invoker
-  - jjs-invoker-shim
-  - jjs-invoker-strace-debugger
+  - invoker
+  - invoker-shim
+  - invoker-strace-debugger
 buildTimeoutMinutes: 15

ci/e2e-build.sh

@@ -14,6 +14,6 @@ cargo build -p test-runner -Zunstable-options --out-dir ./out
 
 mkdir e2e-artifacts
 cp ./out/test-runner e2e-artifacts/test-runner
-skopeo copy docker-daemon:jjs-invoker:latest dir:e2e-artifacts/invoker
-skopeo copy docker-daemon:jjs-invoker-shim:latest dir:e2e-artifacts/shim
-skopeo copy docker-daemon:jjs-invoker-strace-debugger:latest dir:e2e-artifacts/debugger
+skopeo copy docker-daemon:invoker:latest dir:e2e-artifacts/invoker
+skopeo copy docker-daemon:invoker-shim:latest dir:e2e-artifacts/shim
+skopeo copy docker-daemon:invoker-strace-debugger:latest dir:e2e-artifacts/debugger

ci/e2e-run.sh

@@ -1,16 +1,16 @@
 set -euxo pipefail
 
-skopeo copy dir:e2e-artifacts/invoker docker-daemon:jjs-invoker:latest
-skopeo copy dir:e2e-artifacts/shim docker-daemon:jjs-invoker-shim:latest
-skopeo copy dir:e2e-artifacts/debugger docker-daemon:jjs-invoker-strace-debugger:latest
+skopeo copy dir:e2e-artifacts/invoker docker-daemon:invoker:latest
+skopeo copy dir:e2e-artifacts/shim docker-daemon:invoker-shim:latest
+skopeo copy dir:e2e-artifacts/debugger docker-daemon:invoker-strace-debugger:latest
 
 
 mkdir e2e-logs
 chmod +x e2e-artifacts/test-runner
 
 export DOCKER_BUILDKIT=1
     ./e2e-artifacts/test-runner \
-    --invoker-image=jjs-invoker \
-    --shim-image=jjs-invoker-shim \
-    --strace-debug-image=jjs-invoker-strace-debugger \
+    --invoker-image=invoker \
+    --shim-image=invoker-shim \
+    --strace-debug-image=invoker-strace-debugger \
     --logs=e2e-logs

ci/publish-images.sh

@@ -15,9 +15,9 @@ else
   exit 1
 fi
 echo $GITHUB_TOKEN | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-docker tag jjs-invoker ghcr.io/jjs-dev/jjs-invoker:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker:$TAG
-docker tag jjs-invoker-shim ghcr.io/jjs-dev/jjs-invoker-shim:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker-shim:$TAG
-docker tag jjs-invoker-strace-debugger ghcr.io/jjs-dev/jjs-invoker-strace-debugger:$TAG
-docker push ghcr.io/jjs-dev/jjs-invoker-strace-debugger:$TAG
+docker tag invoker ghcr.io/jjs-dev/invoker:$TAG
+docker push ghcr.io/jjs-dev/invoker:$TAG
+docker tag invoker-shim ghcr.io/jjs-dev/invoker-shim:$TAG
+docker push ghcr.io/jjs-dev/invoker-shim:$TAG
+docker tag invoker-strace-debugger ghcr.io/jjs-dev/invoker-strace-debugger:$TAG
+docker push ghcr.io/jjs-dev/invoker-strace-debugger:$TAG

scripts/build-all.sh

@@ -1,5 +1,5 @@
 set -euxo pipefail
 
-docker build . --target invoker "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker
-docker build . --target shim "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker-shim
-docker build . --target strace-debug "--build-arg=EXTRA_ARGS=$@" --tag jjs-invoker-strace-debugger
+docker build . --target invoker "--build-arg=EXTRA_ARGS=$@" --tag invoker
+docker build . --target shim "--build-arg=EXTRA_ARGS=$@" --tag invoker-shim
+docker build . --target strace-debug "--build-arg=EXTRA_ARGS=$@" --tag invoker-strace-debugger