diff --git a/.github/workflows/labrinth-docker.yml b/.github/workflows/labrinth-docker.yml index 01750acfd..751e93f48 100644 --- a/.github/workflows/labrinth-docker.yml +++ b/.github/workflows/labrinth-docker.yml @@ -41,7 +41,7 @@ jobs: id: docker_build uses: docker/build-push-action@v2 with: - context: ./apps/labrinth + file: ./apps/labrinth/Dockerfile push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.docker_meta.outputs.tags }} labels: ${{ steps.docker_meta.outputs.labels }} diff --git a/apps/labrinth/Dockerfile b/apps/labrinth/Dockerfile index 851579f78..5bfaf2548 100644 --- a/apps/labrinth/Dockerfile +++ b/apps/labrinth/Dockerfile @@ -3,7 +3,7 @@ ENV PKG_CONFIG_ALLOW_CROSS=1 WORKDIR /usr/src/labrinth COPY . . -RUN cargo build --release +RUN cargo build --release --package labrinth FROM debian:bookworm-slim @@ -20,8 +20,8 @@ RUN apt-get update \ RUN update-ca-certificates COPY --from=build /usr/src/labrinth/target/release/labrinth /labrinth/labrinth -COPY --from=build /usr/src/labrinth/migrations/* /labrinth/migrations/ -COPY --from=build /usr/src/labrinth/assets /labrinth/assets +COPY --from=build /usr/src/labrinth/apps/labrinth/migrations/* /labrinth/migrations/ +COPY --from=build /usr/src/labrinth/apps/labrinth/assets /labrinth/assets WORKDIR /labrinth -CMD /labrinth/labrinth \ No newline at end of file +CMD /labrinth/labrinth