From a780d46f402f5f3670bf83ca6261006d96ccfd83 Mon Sep 17 00:00:00 2001 From: Luc Date: Wed, 4 Dec 2024 14:53:58 +0100 Subject: [PATCH] Update CI --- .github/workflows/build.yaml | 2 +- engine/.build/Dockerfile | 10 +--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 49040e0..f01ba24 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -53,7 +53,7 @@ jobs: - name: Migrate db working-directory: ./engine - run: cargo install sqlx-cli --no-default-features --features native-tls,postgres && sqlx migrate run && sqlx migrate prepare + run: cargo install sqlx-cli --no-default-features --features native-tls,postgres && sqlx migrate run && sqlx prepare - name: Stop postgres via docker-compose dev diff --git a/engine/.build/Dockerfile b/engine/.build/Dockerfile index aa288a3..c983740 100644 --- a/engine/.build/Dockerfile +++ b/engine/.build/Dockerfile @@ -6,9 +6,6 @@ RUN groupadd -g 10001 -r dockergrp && useradd -r -g dockergrp -u 10001 dockeruse ARG BINARY_NAME_DEFAULT ENV BINARY_NAME=$BINARY_NAME_DEFAULT -ARG DATABASE_URL -ENV DATABASE_URL=$DATABASE_URL - # Build the project with target x86_64-unknown-linux-musl # Build dummy main with the project's Cargo lock and toml @@ -26,12 +23,7 @@ COPY src ./src COPY migrations ./migrations COPY .sqlx ./sqlx -RUN echo "DATABASE_URL=$DATABASE_URL" - -# Debugging: Print the DATABASE_URL to verify it's being set -RUN echo "DATABASE_URL during build: $DATABASE_URL" - -RUN set -x && DATABASE_URL=$DATABASE_URL cargo build --target x86_64-unknown-linux-musl --release +RUN set -x && cargo build --target x86_64-unknown-linux-musl --release RUN mkdir -p /build-out RUN set -x && cp target/x86_64-unknown-linux-musl/release/$BINARY_NAME /build-out/