Merge branch 'develop' into feature/docker-revamp

.gitlab-ci/Jobs/build_image.yml

@@ -1,4 +1,4 @@
-.passbolt-build:
+.passbolt-prerelease:
   stage: build
   image:
     name: gcr.io/kaniko-project/executor:debug
@@ -20,8 +20,8 @@
         --dockerfile $CI_PROJECT_DIR/debian/Dockerfile \
         --destination $CI_REGISTRY_IMAGE:${PASSBOLT_FLAVOUR:-local}-$(date +%s)
 
-docker-build-pro:
-  extends: .passbolt-build
+prerelease-pro:
+  extends: .passbolt-prerelease
   variables:
     PASSBOLT_URL: "https://gitlab.com/api/v4/projects/$UPSTREAM_PROJECT_ID/repository/archive.tar.gz?sha=$UPSTREAM_COMMIT_SHA"
     PASSBOLT_CURL_HEADERS: "PRIVATE-TOKEN: $PRIVATE_TOKEN"

debian/Dockerfile

@@ -3,9 +3,9 @@ FROM debian:buster-slim
 LABEL maintainer="Passbolt SA <contact@passbolt.com>"
 
 ENV PASSBOLT_PKG_KEY=0xDE8B853FC155581D
+ENV PASSBOLT_PKG=passbolt-ce-server
 ENV PHP_VERSION=7.3
 
-ARG PASSBOLT_PKG=passbolt-ce-server
 ARG PASSBOLT_REPO_URL="https://download.passbolt.com/ce/debian"
 ARG PASSBOLT_DISTRO="buster"
 ARG PASSBOLT_COMPONENT="stable"