diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e312a7da092c32ed661f248e0cb7fc3ff1a2a4b..2e56b36e77786787d5fa5ed43f5a50a1bc9433c7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,8 @@ include: - project: "AlekSIS/official/AlekSIS" file: /ci/build/dist.yml - project: "AlekSIS/official/AlekSIS" - file: /ci/build/docker.yml + file: /ci/publish/pypi.yml - project: "AlekSIS/official/AlekSIS" - file: /ci/deploy/pages.yml + file: /ci/docker/image.yml - project: "AlekSIS/official/AlekSIS" - file: /ci/deploy/pypi.yml + file: /ci/deploy/pages.yml diff --git a/Dockerfile b/Dockerfile index 1bde7cd1f4c2d80784369bfa9ef5cf4fceecea91..99f801234db47cfab3da618299973c61eaa41dc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,9 +40,10 @@ RUN case ",$EXTRAS," in \ esac # Install core +ARG APP_VERISON="" RUN set -e; \ mkdir -p /var/lib/aleksis/media /usr/share/aleksis/static /var/lib/aleksis/backups; \ - eatmydata pip install AlekSIS-Core\[$EXTRAS\] + eatmydata pip install AlekSIS-Core\[$EXTRAS\]$APP_VERSION # Declare a persistent volume for all data VOLUME /var/lib/aleksis