add rules to target ecloud (7ac001ad) · Commits · e / infra / ecloud / nextcloud

.gitlab-ci.yml

+19 −7

Original line number	Diff line number	Diff line
		@@ -16,22 +16,34 @@ default:
		- generic_privileged

		build-branch:
		except:
		- tags
		variables:
		TARGET: "selfhost-privacy"
		TARGET: "ecloud"
		rules:
		# Match expcept tags rule
		- if: '$CI_COMMIT_TAG =~ "/^$/"'
		when: always
		# If branch is a selfhost
		- if: `$CI_COMMIT_REF_SLUG =~ "/^selfhost*/"`
		variables:
		TARGET: "selfhost"
		- when: never
		stage: build
		script:
		- docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" .
		- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"

		build-tag:
		only:
		- tags
		variables:
		TARGET: "selfhost-privacy"
		TARGET: "ecloud"
		rules:
		- if: '$CI_COMMIT_TAG !~ "/^$/"'
		when: always
		- if: `$CI_COMMIT_TAG =~ "/^selfhost*/"`
		variables:
		TARGET: "selfhost"
		when: always
		- when: never
		stage: build
		script:
		- if [ "$CI_COMMIT_TAG" == "selfhost" ]; then export TARGET="selfhost"; fi
		- docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG" .
		- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"

+1 −1

Original line number	Diff line number	Diff line
		@@ -137,7 +137,7 @@ RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/0
		RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
		RUN rm -rf ${TMP_PATCH_DIR}

		FROM selfhost as selfhost-privacy
		FROM selfhost as ecloud
		ARG BASE_DIR="/usr/src/nextcloud"
		ARG TMP_PATCH_DIR="/tmp/build_patches"