Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
W
Web site
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
commul
MERLIN Platform
Web site
Commits
c02caee9
Verified
Commit
c02caee9
authored
3 years ago
by
egon w. stemle
Browse files
Options
Downloads
Patches
Plain Diff
Use CI on all branches
parent
2ddaa7bf
No related branches found
No related tags found
No related merge requests found
Pipeline
#11547
failed
3 years ago
Stage: build
Stage: deploy
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+5
-5
5 additions, 5 deletions
.gitlab-ci.yml
kustomize/overlays/staging/kustomization.yaml
+1
-1
1 addition, 1 deletion
kustomize/overlays/staging/kustomization.yaml
with
6 additions
and
6 deletions
.gitlab-ci.yml
+
5
−
5
View file @
c02caee9
variables
:
variables
:
CONTAINER_IMAGE
:
"
gitlab.inf.unibz.it:4567/commul/merlin-platform/www
/master
"
CONTAINER_IMAGE
:
"
gitlab.inf.unibz.it:4567/commul/merlin-platform/www"
DOCKER_BUILDER_IMAGE
:
"
docker:19.03.1"
DOCKER_BUILDER_IMAGE
:
"
docker:19.03.1"
DOCKER_TLS_CERTDIR
:
"
"
# See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
DOCKER_TLS_CERTDIR
:
"
"
# See https://gitlab.com/gitlab-org/gitlab-runner/issues/4501
KUBECTL
:
"
https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl"
KUBECTL
:
"
https://storage.googleapis.com/kubernetes-release/release/v1.8.10/bin/linux/amd64/kubectl"
...
@@ -21,10 +21,10 @@ build:
...
@@ -21,10 +21,10 @@ build:
script
:
script
:
-
docker build --rm --no-cache --tag=${CONTAINER_IMAGE}:${CI_COMMIT_SHA} .
-
docker build --rm --no-cache --tag=${CONTAINER_IMAGE}:${CI_COMMIT_SHA} .
-
docker push ${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
-
docker push ${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
-
docker tag ${CONTAINER_IMAGE}:${CI_COMMIT_SHA} ${CONTAINER_IMAGE}:
staging
-
docker tag ${CONTAINER_IMAGE}:${CI_COMMIT_SHA} ${CONTAINER_IMAGE}:
latest
-
docker push ${CONTAINER_IMAGE}:
staging
-
docker push ${CONTAINER_IMAGE}:
latest
only
:
only
:
-
master
-
branches
deploy_staging
:
deploy_staging
:
stage
:
deploy
stage
:
deploy
...
@@ -42,4 +42,4 @@ deploy_staging:
...
@@ -42,4 +42,4 @@ deploy_staging:
-
docker pull ${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
-
docker pull ${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
-
kubectl --namespace kommul-dev set image deployment/merlin browser=${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
-
kubectl --namespace kommul-dev set image deployment/merlin browser=${CONTAINER_IMAGE}:${CI_COMMIT_SHA}
only
:
only
:
-
master
-
branches
This diff is collapsed.
Click to expand it.
kustomize/overlays/staging/kustomization.yaml
+
1
−
1
View file @
c02caee9
...
@@ -21,7 +21,7 @@ namespace: kommul-dev
...
@@ -21,7 +21,7 @@ namespace: kommul-dev
images
:
images
:
-
name
:
WEBSERVER
-
name
:
WEBSERVER
newName
:
gitlab.inf.unibz.it:4567/commul/merlin-platform/www
/master
:445bc35dde4520cab61a36c793c7c5a626f43e62
newName
:
gitlab.inf.unibz.it:4567/commul/merlin-platform/www:445bc35dde4520cab61a36c793c7c5a626f43e62
patchesJSON6902
:
patchesJSON6902
:
-
target
:
-
target
:
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment