Add selfhost CI/CD and selfhost Dockerfile steps (3c3f200e) · Commits · e / infra / ecloud / nextcloud

.gitlab-ci.yml

+55 −0

Original line number	Diff line number	Diff line
		@@ -14,11 +14,32 @@ default:
		tags:
		- generic_privileged

		<<<<<<< HEAD
		.build-docker:
		=======
		build-branch:
		stage: build
		variables:
		TARGET: ecloud
		SUBPATH: ''
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
		when: never
		- if: $CI_COMMIT_TAG != null
		when: never
		- if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
		variables:
		TARGET: "selfhost"
		SUBPATH: "/selfhost"
		- if: $CI_COMMIT_REF_SLUG != null
		when: on_success
		allow_failure: true
		>>>>>>> f25afbd (Add selfhost CI/CD and selfhost Dockerfile steps)
		script:
		- echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
		- docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" .
		- docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG"
		<<<<<<< HEAD

		build-branch:
		stage: build
		@@ -56,3 +77,37 @@ build-tag-selfhost:
		only:
		- tags
		extends: .build-docker
		=======

		build-tag:
		stage: build
		variables:
		TARGET: ecloud
		SUBPATH: ''
		allow_failure: true
		rules:
		- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
		when: never
		- if: $CI_COMMIT_TAG == null
		when: never
		- if: $CI_COMMIT_REF_SLUG =~ /^selfhost/
		variables:
		TARGET: "selfhost"
		SUBPATH: "/selfhost"
		- if: $CI_COMMIT_TAG != null
		when: on_success
		script:
		- echo "TARGET $TARGET, BRANCH $CI_COMMIT_BRANCH, COMMIT_REF_SLUG $CI_COMMIT_REF_SLUG, COMMIT_TAG $CI_COMMIT_TAG"
		- docker build --target $TARGET --pull -t "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG" .
		- docker push "$CI_REGISTRY_IMAGE$SUBPATH:$CI_COMMIT_REF_SLUG"

		docker-tag:
		stage: .post
		rules:
		- when: manual
		script:
		- echo "SOURCE $SOURCE, TARGET $TARGET"
		- docker pull $CI_REGISTRY_IMAGE:$SOURCE
		- docker tag $CI_REGISTRY_IMAGE:$SOURCE $CI_REGISTRY_IMAGE:$TARGET
		- docker push $CI_REGISTRY_IMAGE:$TARGET
		>>>>>>> f25afbd (Add selfhost CI/CD and selfhost Dockerfile steps)

Dockerfile

+5 −1

Original line number	Diff line number	Diff line
		@@ -152,7 +152,6 @@ RUN patch -u ${BASE_DIR}/apps/settings/lib/Settings/Personal/ServerDevNotice.php
		RUN patch -u ${BASE_DIR}/lib/private/Template/IconsCacher.php -i ${TMP_PATCH_DIR}/008-icons-cacher-theme-svgs.patch
		RUN patch -u ${BASE_DIR}/core/Controller/SvgController.php -i ${TMP_PATCH_DIR}/008-svg-controller-theme-svgs.patch
		RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/009-help-links.patch
		RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
		RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/011-privacy-settings.patch
		RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
		RUN patch -u ${BASE_DIR}/lib/private/Authentication/Token/PublicKeyTokenProvider.php -i ${TMP_PATCH_DIR}/013-revert-token-password-update.patch
		@@ -175,6 +174,11 @@ RUN patch -u ${BASE_DIR}/core/templates/layout.user.php -i ${TMP_PATCH_DIR}/003-
		RUN patch -u ${BASE_DIR}/core/Controller/ContactsMenuController.php -i ${TMP_PATCH_DIR}/004-contact-search-controller-removal.patch
		RUN cd ${BASE_DIR} && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-core.patch
		RUN cd ${BASE_DIR}/custom_apps && patch -p0 < ${TMP_PATCH_DIR}/005-autocomplete-user-leak-custom-app.patch
		<<<<<<< HEAD
		=======
		RUN patch -u ${BASE_DIR}/lib/private/Updater.php -i ${TMP_PATCH_DIR}/010-disable-app-store-upgrade.patch
		RUN cd ${BASE_DIR} && patch -u ${BASE_DIR}/apps/dashboard/lib/Controller/DashboardController.php -i ${TMP_PATCH_DIR}/012-remove-user-status-widget.patch
		>>>>>>> f25afbd (Add selfhost CI/CD and selfhost Dockerfile steps)

		RUN rm -rf ${TMP_PATCH_DIR}