From dcefab701e8d4ca732f854b22f1d2a848bdb1892 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Thu, 28 Nov 2024 16:52:24 +0100 Subject: [PATCH] Fixed workflow --- .github/workflows/modoboa.yml | 2 +- docker/Dockerfile.dev | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/modoboa.yml b/.github/workflows/modoboa.yml index 2c65eadc4..893468a62 100644 --- a/.github/workflows/modoboa.yml +++ b/.github/workflows/modoboa.yml @@ -148,7 +148,7 @@ jobs: OIDC_RSA_PRIVATE_KEY: ${{ vars.OIDC_RSA_PRIVATE_KEY }} - name: Upload coverage result - if: ${{ matrix.python-version == '3.11' && matrix.database == 'postgres' }} + if: ${{ matrix.python-version == '3.12' && matrix.database == 'postgres' }} uses: actions/upload-artifact@v4 with: name: coverage-results diff --git a/docker/Dockerfile.dev b/docker/Dockerfile.dev index cd965d33d..536ff01ec 100644 --- a/docker/Dockerfile.dev +++ b/docker/Dockerfile.dev @@ -1,10 +1,10 @@ -FROM python:3.12-alpine as base +FROM python:3.12-alpine AS base -MAINTAINER Antoine Nguyen +LABEL org.opencontainers.image.authors="Antoine Nguyen " ENV VIRTUAL_ENV=/opt/venv ENV PATH="$VIRTUAL_ENV/bin:$PATH" -FROM base as build +FROM base AS build RUN apk add --update openssl librrd python3-dev libffi-dev gcc g++ musl-dev libxml2-dev libxslt-dev \ libressl-dev jpeg-dev rrdtool-dev file make gettext freetype-dev cairo-dev cargo \ @@ -16,7 +16,8 @@ COPY test-requirements.txt /tmp COPY dev-requirements.txt /tmp RUN python -m pip install -U pip RUN pip install -r requirements.txt -r test-requirements.txt -r dev-requirements.txt -FROM base as run + +FROM base AS run COPY docker/doveadm /usr/local/bin RUN chmod +x /usr/local/bin/doveadm COPY --from=build $VIRTUAL_ENV $VIRTUAL_ENV