From 6a924f0a8a57e115366db72a8c7e0ab8e61c179f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Oct 2021 00:45:11 +0300 Subject: [PATCH 1/4] Dockerfile for test --- test/Dockerfile | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 test/Dockerfile diff --git a/test/Dockerfile b/test/Dockerfile new file mode 100644 index 0000000..89ee38b --- /dev/null +++ b/test/Dockerfile @@ -0,0 +1,8 @@ +FROM b4tman/armhf-alpine-qemu:test + +RUN [ "cross-build-start" ] + +RUN sh -exc "[ \"armv7l\" = `uname -m` ] || exit 1" + +RUN [ "cross-build-end" ] + From 43e702864ae83d27a1b4653ff3ff0c11a44201b8 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Oct 2021 00:53:09 +0300 Subject: [PATCH 2/4] ci: test image --- .github/workflows/dockerimage.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 0155474..c76c527 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -14,9 +14,13 @@ jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v2 - name: Build the Docker image - run: docker build . --file Dockerfile --tag b4tman/armhf-alpine-qemu:$(date +%s) + run: docker build . --file Dockerfile --tag b4tman/armhf-alpine-qemu:test + - name: Test image + env: + DOCKER_BUILDKIT: 0 + run: docker build -t tmp/test1 -f test/Dockerfile test From b6b2fc3727982a6a691b52b915d6bfc828456c9f Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Oct 2021 10:10:10 +0300 Subject: [PATCH 3/4] fix test Dockerfile --- test/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/Dockerfile b/test/Dockerfile index 89ee38b..907f909 100644 --- a/test/Dockerfile +++ b/test/Dockerfile @@ -2,7 +2,7 @@ FROM b4tman/armhf-alpine-qemu:test RUN [ "cross-build-start" ] -RUN sh -exc "[ \"armv7l\" = `uname -m` ] || exit 1" +RUN sh -exc "[ \"armv7l\" = `uname -m` ]" RUN [ "cross-build-end" ] From aa4a1dc7bd948732db0a6d4a53175c62ed2fdaf3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 11 Oct 2021 10:10:52 +0300 Subject: [PATCH 4/4] use docker/build-push-action --- .github/workflows/dockerimage.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index c76c527..37d746f 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -17,10 +17,15 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - name: Build the Docker image - run: docker build . --file Dockerfile --tag b4tman/armhf-alpine-qemu:test + - uses: actions/checkout@v2 + - name: Build image + uses: docker/build-push-action@v2 + with: + context: . + push: false + tags: b4tman/armhf-alpine-qemu:test + outputs: type=image,name=b4tman/armhf-alpine-qemu:test,push=false - name: Test image env: DOCKER_BUILDKIT: 0 - run: docker build -t tmp/test1 -f test/Dockerfile test + run: docker build --force-rm -t tmp/test1 -f test/Dockerfile test