diff --git a/.github/workflows/sub-image-check.yml b/.github/workflows/sub-image-check.yml index cad208c..3ccea62 100644 --- a/.github/workflows/sub-image-check.yml +++ b/.github/workflows/sub-image-check.yml @@ -38,11 +38,10 @@ jobs: cargo build --release --target aarch64-unknown-linux-gnu cargo build --release --target x86_64-unknown-linux-gnu - mkdir /tmp/sub-image/arm64 -p - mkdir /tmp/sub-image/amd64 -p + mkdir ./tmp - cp target/x86_64-unknown-linux-gnu/release/sub-image /tmp/sub-image/amd64/sub-image - cp target/aarch64-unknown-linux-gnu/release/sub-image /tmp/sub-image/arm64/sub-image + cp target/x86_64-unknown-linux-gnu/release/sub-image ./tmp/amd64 + cp target/aarch64-unknown-linux-gnu/release/sub-image ./tmp/arm64 - name: Build image if: github.ref_name == 'main' uses: ./.github/actions/build diff --git a/.gitignore b/.gitignore index 5798932..f15a241 100644 --- a/.gitignore +++ b/.gitignore @@ -152,3 +152,5 @@ docker-compose.yml test_results/* !test_results/.gitkeep + +sub-image/tmp diff --git a/sub-image/Dockerfile b/sub-image/Dockerfile index 677c955..cc6a3f0 100644 --- a/sub-image/Dockerfile +++ b/sub-image/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 ARG TARGETARCH -COPY /tmp/sub-image/${TARGETARCH}/sub-image /app/sub-image +COPY ./tmp/${TARGETARCH} /app/sub-image WORKDIR /app ENTRYPOINT ["/app/sub-image"]