diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cf4dbdbca..914baf839 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,6 +265,9 @@ build-docker-tag: --platform linux/${ARCH} --provenance=false --build-arg="${ERL_FLAGS}" + --build-arg VCS_REF="${CI_COMMIT_SHA}" + --build-arg BUILD_DATE="${CI_JOB_STARTED_AT}" + --build-arg VERSION="${CI_COMMIT_TAG}" -t kaihuri/mobilizon:${CI_COMMIT_TAG}-${ARCH} -f docker/production/Dockerfile . parallel: diff --git a/.tool-versions b/.tool-versions index 91256ffc0..cc71c9225 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,3 +1,4 @@ erlang 26.2.2 elixir 1.16.1-otp-26 nodejs 18.19.1 +python 3.13.1-v3 diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile index f62b9dfc4..73870f92b 100644 --- a/docker/production/Dockerfile +++ b/docker/production/Dockerfile @@ -45,10 +45,11 @@ LABEL org.opencontainers.image.title="mobilizon" \ org.opencontainers.image.vendor="mobilizon.org" \ org.opencontainers.image.documentation="https://docs.mobilizon.org" \ org.opencontainers.image.licenses="AGPL-3.0" \ - org.opencontainers.image.source="https://framagit.org/framasoft/mobilizon" \ + org.opencontainers.image.source="https://framagit.org/kaihuri/mobilizon" \ org.opencontainers.image.url="https://mobilizon.org" \ org.opencontainers.image.revision=$VCS_REF \ - org.opencontainers.image.created=$BUILD_DATE + org.opencontainers.image.created=$BUILD_DATE \ + org.opencontainers.image.version=$VERSION RUN apk add --no-cache curl openssl ca-certificates ncurses-libs file postgresql-client libgcc libstdc++ imagemagick python3 py3-pip py3-pillow py3-cffi py3-brotli gcc g++ musl-dev python3-dev pango libxslt-dev ttf-cantarell RUN pip --no-cache-dir install --break-system-packages weasyprint pyexcel-ods3