From b07c57c010bde58f425f6fbd466ca9ba971ba43a Mon Sep 17 00:00:00 2001 From: Daniel Del Rio Figueira Date: Mon, 25 Jan 2021 19:03:00 +0100 Subject: [PATCH] Changed: fix job names and build args. --- .gitlab-ci/Jobs/build_image.yml | 6 +++--- debian/Dockerfile | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/Jobs/build_image.yml b/.gitlab-ci/Jobs/build_image.yml index 6af2da0..b86594b 100644 --- a/.gitlab-ci/Jobs/build_image.yml +++ b/.gitlab-ci/Jobs/build_image.yml @@ -1,4 +1,4 @@ -.passbolt-prerelease: +.passbolt-build: 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) -prerelease-pro: - extends: .passbolt-prerelease +docker-build-pro: + extends: .passbolt-build 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" diff --git a/debian/Dockerfile b/debian/Dockerfile index 38fe0aa..65640ab 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -3,9 +3,9 @@ FROM debian:buster-slim LABEL maintainer="Passbolt SA " 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"