Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
index eec356b9f47..ca5b0bf0764 100644
--- a/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
+++ b/vendor/gitlab-ci-yml/Auto-DevOps.gitlab-ci.yml
@@ -462,6 +462,11 @@ production:
}
function create_secret() {
+<<<<<<< HEAD
+=======
+ echo "Create secret..."
+
+>>>>>>> ea14c1e6963... Merge branch 'vendor-10-4-auto-devops-template' into 'master'
kubectl create secret -n "$KUBE_NAMESPACE" \
docker-registry gitlab-registry \
--docker-server="$CI_REGISTRY" \