diff --git a/.dockerignore b/.dockerignore index 4509c90..84b16af 100644 --- a/.dockerignore +++ b/.dockerignore @@ -28,6 +28,7 @@ **/values.dev.yaml /bin /target +!/target/**/monzo-ingestion /.idea LICENSE README.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c033547..b1d87e7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -78,9 +78,9 @@ jobs: target/release/${{ env.RUST_BINARY_NAME }} target/aarch64-unknown-linux-musl/release/${{ env.RUST_BINARY_NAME }} - # The target directory is kept in the .dockerignore file, so allow these to be copied in we need to move them to a - # new directory. - - run: mv target docker-binaries +# # The target directory is kept in the .dockerignore file, so allow these to be copied in we need to move them to a +# # new directory. +# - run: mv target docker-binaries - name: Build and push multi-arch Docker image uses: docker/build-push-action@v4 diff --git a/Dockerfile b/Dockerfile index aca7ba8..ecc0ab0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM --platform=$BUILDPLATFORM debian:bullseye-slim AS builder ARG TARGETPLATFORM ARG BINARY_NAME WORKDIR /app -COPY . . +COPY /target /app/target RUN case "$TARGETPLATFORM" in \ "linux/amd64") BINARY_PATH="target/release/${BINARY_NAME}" ;; \ "linux/arm64") BINARY_PATH="target/aarch64-unknown-linux-gnu/release/${BINARY_NAME}" ;; \