Fix tester image arg name, update maker image (#47)

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
cilium · Jun 23, 2020 · 0502595 · 0502595
1 parent d47f6ac
commit 0502595
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/images.yaml b/.github/workflows/images.yaml
@@ -9,17 +9,17 @@ jobs:
  runs-on: ubuntu-18.04
  steps:
  - uses: actions/checkout@v1
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Register binfmt from multi-platform builds
  with:
  entrypoint: docker
  args: run --privileged linuxkit/binfmt:5d33e7346e79f9c13a73c6952669e47a53b063d4 
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make lint
  with:
  entrypoint: make
  args: lint
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make maker-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
@@ -29,15 +29,15 @@ jobs:
  with:
  entrypoint: make
  args: maker-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make tester-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
  DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
  with:
  entrypoint: make
  args: tester-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make compilers-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
@@ -47,7 +47,7 @@ jobs:
  with:
  entrypoint: make
  args: compilers-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make bpftool-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
@@ -57,7 +57,7 @@ jobs:
  with:
  entrypoint: make
  args: bpftool-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make iproute2-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
@@ -67,7 +67,7 @@ jobs:
  with:
  entrypoint: make
  args: iproute2-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make llvm-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
@@ -77,15 +77,15 @@ jobs:
  with:
  entrypoint: make
  args: llvm-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make startup-script-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
  DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
  with:
  entrypoint: make
  args: startup-script-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make ca-certificates-image
  env:
  DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}

diff --git a/.github/workflows/pr-checks.yaml b/.github/workflows/pr-checks.yaml
@@ -7,7 +7,7 @@ jobs:
  runs-on: ubuntu-18.04
  steps:
  - uses: actions/checkout@v1
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ - uses: docker://docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c
  name: Run make lint
  with:
  entrypoint: make

diff --git a/images/compilers/Dockerfile b/images/compilers/Dockerfile
@@ -12,7 +12,7 @@ RUN /tmp/install-deps.sh
 COPY install-bazel.sh /tmp/install-bazel.sh
 RUN /tmp/install-bazel.sh
 
-FROM ${CST_IMAGE} as test
+FROM ${TESTER_IMAGE} as test
 COPY --from=builder / /
 COPY test /test
 RUN /test/bin/cst

diff --git a/scripts/build-image.sh b/scripts/build-image.sh
@@ -7,7 +7,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c}"
+MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c}"
 
 with_root_context="${ROOT_CONTEXT:-false}"
 

diff --git a/scripts/get-image-digest.sh b/scripts/get-image-digest.sh
@@ -7,7 +7,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c}"
+MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c}"
 
 if [ "$#" -ne 1 ] ; then
  echo "$0 supports exactly 1 argument"

diff --git a/scripts/lint.sh b/scripts/lint.sh
@@ -7,7 +7,7 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c}"
+MAKER_IMAGE="${MAKER_IMAGE:-docker.io/cilium/image-maker:3e2ea4f151593908c362307a1de22e68610d955c}"
 
 root_dir="$(git rev-parse --show-toplevel)"