From 1d42dd26ed1b2635a7ba6c261e5dfcca032fdee7 Mon Sep 17 00:00:00 2001 From: leo <260626284+cameledev@users.noreply.github.com> Date: Tue, 24 Feb 2026 16:16:56 +0100 Subject: [PATCH] harmonize docker commands --- .github/workflows/docker-hub.yml | 8 ++++---- Makefile | 12 ++++++------ bin/Tiltfile | 4 ++-- compose.yml | 8 ++++---- src/agents/Dockerfile | 2 +- src/summary/Dockerfile | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/docker-hub.yml b/.github/workflows/docker-hub.yml index d23f12b8..75249e66 100644 --- a/.github/workflows/docker-hub.yml +++ b/.github/workflows/docker-hub.yml @@ -152,7 +152,7 @@ jobs: uses: numerique-gouv/action-trivy-cache@main continue-on-error: true with: - docker-build-args: '-f src/summary/Dockerfile --target production' + docker-build-args: '-f src/summary/Dockerfile --target summary-production' docker-image-name: '${{ env.DOCKER_CONTAINER_REGISTRY_HOSTNAME }}/${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-summary:${{ github.sha }}' docker-context: './src/summary' - @@ -161,7 +161,7 @@ jobs: with: context: ./src/summary file: ./src/summary/Dockerfile - target: production + target: summary-production build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} @@ -191,7 +191,7 @@ jobs: uses: numerique-gouv/action-trivy-cache@main continue-on-error: true with: - docker-build-args: '-f src/agents/Dockerfile --target production' + docker-build-args: '-f src/agents/Dockerfile --target agents-production' docker-image-name: '${{ env.DOCKER_CONTAINER_REGISTRY_HOSTNAME }}/${{ env.DOCKER_CONTAINER_REGISTRY_NAMESPACE }}/meet-agents:${{ github.sha }}' docker-context: './src/agents' - @@ -200,7 +200,7 @@ jobs: with: context: ./src/agents file: ./src/agents/Dockerfile - target: production + target: agents-production build-args: DOCKER_USER=${{ env.DOCKER_USER }}:-1000 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} diff --git a/Makefile b/Makefile index 177d7214..c817f67c 100644 --- a/Makefile +++ b/Makefile @@ -227,9 +227,9 @@ back-i18n-generate: ## create the .pot files used for i18n @$(MANAGE) makemessages -a --keep-pot .PHONY: back-i18n-generate -shell: ## connect to database shell +shell: ## open a Django Python shell @$(MANAGE) shell #_plus -.PHONY: dbshell +.PHONY: shell # -- Database @@ -348,16 +348,16 @@ build-k8s-cluster: ## build the kubernetes cluster using kind install-external-secrets: ## install the kubernetes secrets from Vaultwarden ./bin/install-external-secrets.sh -.PHONY: build-k8s-cluster +.PHONY: install-external-secrets start-tilt: ## start the kubernetes cluster using kind tilt up -f ./bin/Tiltfile -.PHONY: build-k8s-cluster +.PHONY: start-tilt start-tilt-keycloak: ## start the kubernetes cluster using kind, without Pro Connect for authentication, use keycloak DEV_ENV=dev-keycloak tilt up -f ./bin/Tiltfile -.PHONY: build-k8s-cluster +.PHONY: start-tilt-keycloak start-tilt-dinum: ## start the kubernetes cluster using kind, without Pro Connect for authentication, but with DINUM styles DEV_ENV=dev-dinum tilt up -f ./bin/Tiltfile -.PHONY: build-k8s-cluster +.PHONY: start-tilt-dinum diff --git a/bin/Tiltfile b/bin/Tiltfile index 1086116d..df073533 100644 --- a/bin/Tiltfile +++ b/bin/Tiltfile @@ -59,7 +59,7 @@ docker_build( context='../src/summary', dockerfile='../src/summary/Dockerfile', only=['.'], - target = 'production', + target = 'summary-production', live_update=[ sync('../src/summary', '/app'), ] @@ -71,7 +71,7 @@ docker_build( context='../src/agents', dockerfile='../src/agents/Dockerfile', only=['.'], - target = 'production', + target = 'agents-production', live_update=[ sync('../src/agents', '/app'), ] diff --git a/compose.yml b/compose.yml index 993c2539..37a4c067 100644 --- a/compose.yml +++ b/compose.yml @@ -161,7 +161,7 @@ services: args: VITE_API_BASE_URL: "http://localhost:8071" VITE_APP_TITLE: "LaSuite Meet" - image: meet:frontend-development + image: meet:frontend-production ports: - "3000:8080" @@ -252,7 +252,7 @@ services: app-summary-dev: build: context: src/summary - target: development + target: summary-development args: DOCKER_USER: ${DOCKER_USER:-1000} user: ${DOCKER_USER:-1000} @@ -270,7 +270,7 @@ services: build: context: ./src/summary dockerfile: Dockerfile - target: production + target: summary-production command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q transcribe-queue env_file: - env.d/development/summary @@ -290,7 +290,7 @@ services: build: context: ./src/summary dockerfile: Dockerfile - target: production + target: summary-production command: celery -A summary.core.celery_worker worker --pool=solo --loglevel=debug -Q summarize-queue env_file: - env.d/development/summary diff --git a/src/agents/Dockerfile b/src/agents/Dockerfile index 558d1463..63b89efc 100644 --- a/src/agents/Dockerfile +++ b/src/agents/Dockerfile @@ -15,7 +15,7 @@ COPY pyproject.toml . RUN mkdir /install && \ pip install --prefix=/install . -FROM base AS production +FROM base AS agents-production WORKDIR /app diff --git a/src/summary/Dockerfile b/src/summary/Dockerfile index ace69734..3486da60 100644 --- a/src/summary/Dockerfile +++ b/src/summary/Dockerfile @@ -16,7 +16,7 @@ COPY pyproject.toml . RUN pip3 install --no-cache-dir . -FROM base AS development +FROM base AS summary-development WORKDIR /app COPY . . @@ -24,7 +24,7 @@ RUN pip3 install --no-cache-dir -e ".[dev]" || pip3 install --no-cache-dir -e . CMD ["uvicorn", "summary.main:app", "--host", "0.0.0.0", "--port", "8000", "--reload"] -FROM base AS production +FROM base AS summary-production WORKDIR /app