Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix tester image arg name, update maker image #47

Merged
merged 2 commits into from
Jun 23, 2020
Merged

Fix tester image arg name, update maker image #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54e4109
Update make image
errordeveloper Jun 23, 2020
f6e922a
Fix arg name
errordeveloper Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion images/compilers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/build-image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion scripts/get-image-digest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/lint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)"

Expand Down