From 1adc0ffc4ae02d351738fb6a699c32109e1b0bf6 Mon Sep 17 00:00:00 2001 From: pierregeeraert Date: Fri, 17 Jul 2026 15:52:48 +0100 Subject: [PATCH] restructuring --- .gitea/workflows/dockerfile_runner.yaml | 3 ++- .gitea/workflows/dockerfile_testing_runner.yaml | 3 ++- infra/production/dockerfile | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitea/workflows/dockerfile_runner.yaml b/.gitea/workflows/dockerfile_runner.yaml index 8affeca..9fce6eb 100644 --- a/.gitea/workflows/dockerfile_runner.yaml +++ b/.gitea/workflows/dockerfile_runner.yaml @@ -83,7 +83,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - context: infra/production/ + context: . + file: infra/production/dockerfile push: true build-args: | ALLOWED_HOSTS='django.tryton.geeraert.eu' diff --git a/.gitea/workflows/dockerfile_testing_runner.yaml b/.gitea/workflows/dockerfile_testing_runner.yaml index fdde462..1d5b24a 100644 --- a/.gitea/workflows/dockerfile_testing_runner.yaml +++ b/.gitea/workflows/dockerfile_testing_runner.yaml @@ -46,7 +46,8 @@ jobs: - name: Build and push uses: docker/build-push-action@v6 with: - context: infra/testing/ + context: . + file: infra/testing/dockerfile push: true build-args: | ALLOWED_HOSTS='django-testing.tryton.geeraert.eu' diff --git a/infra/production/dockerfile b/infra/production/dockerfile index fe84b3b..260f8d7 100644 --- a/infra/production/dockerfile +++ b/infra/production/dockerfile @@ -12,19 +12,19 @@ ENV DEBUG=$DEBUG WORKDIR /code/ # Copy only the requirements file first (Changes infrequently) -COPY ../../requirements.txt ./ +COPY requirements.txt ./ -RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip +RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade pip RUN pip list --cache-dir=/opt/hostedtoolcache/pip --outdated RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade wheel RUN pip install --cache-dir=/opt/hostedtoolcache/pip --upgrade setuptools RUN pip install --cache-dir=/opt/hostedtoolcache/pip -r requirements.txt # Copy the rest of your application code (Changes frequently, invalidates subsequent cache) -COPY ../../. ./ +COPY . ./ -COPY entrypoint.sh /code/entrypoint.sh +COPY infra/production/entrypoint.sh /code/entrypoint.sh RUN chmod +x /code/entrypoint.sh