Merge branch 'bugfix/ensure-docker-correct-version' into 'master'

[CI] Ensure PyPI and docker builds are run in correct order

See merge request !512

.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

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