From 8f946b20b9ab44d49ab134cbb627ed3522b30c7d Mon Sep 17 00:00:00 2001 From: Valentin Matton Date: Fri, 1 Sep 2023 16:58:00 +0200 Subject: [PATCH] wip --- .github/workflows/api.yml | 5 +---- .github/workflows/deployment.yml | 1 + deployment/docker/docker-compose.yml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/api.yml b/.github/workflows/api.yml index 25f8f4f4..3878a8c0 100644 --- a/.github/workflows/api.yml +++ b/.github/workflows/api.yml @@ -21,7 +21,7 @@ jobs: runs-on: ubuntu-20.04 env: REGISTRY: ghcr.io - IMAGE_NAME: betagouv/data-inclusion-api + IMAGE_NAME: ${{ github.repository }}-api permissions: contents: read @@ -52,9 +52,6 @@ jobs: type=ref,event=pr type=sha - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml index 6188f31e..efda82a4 100644 --- a/.github/workflows/deployment.yml +++ b/.github/workflows/deployment.yml @@ -126,6 +126,7 @@ jobs: - name: start services env: + API_VERSION: ${{ github.sha }} AIRFLOW_CONN_S3: ${{ steps.set-outputs.outputs.airflow_conn_s3 }} AIRFLOW_CONN_PG: ${{ steps.set-outputs.outputs.airflow_conn_pg }} API_SECRET_KEY: ${{ secrets.API_SECRET_KEY }} diff --git a/deployment/docker/docker-compose.yml b/deployment/docker/docker-compose.yml index 0dab693b..df9f4c34 100644 --- a/deployment/docker/docker-compose.yml +++ b/deployment/docker/docker-compose.yml @@ -114,8 +114,7 @@ services: condition: service_completed_successfully api: - image: data-inclusion/api - build: ../../api + image: betagouv/data-inclusion-api:${API_VERSION} restart: always ports: - 8000:8000