Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Léo-Paul Géneau
gitlab-ce
Commits
24426f37
Commit
24426f37
authored
Mar 12, 2019
by
Balasankar "Balu" C
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Tag asset docker image with GitLab version also
Signed-off-by:
Balasankar "Balu" C
<
balasankar@gitlab.com
>
parent
e4b2c3b0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
scripts/build_assets_image
scripts/build_assets_image
+6
-0
scripts/trigger-build
scripts/trigger-build
+1
-1
No files found.
scripts/build_assets_image
View file @
24426f37
...
@@ -27,3 +27,9 @@ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
...
@@ -27,3 +27,9 @@ docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
docker push
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_REF_SLUG
}
docker push
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_REF_SLUG
}
docker push
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_SHA
}
docker push
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_SHA
}
# Also tag the image with GitLab version, if running on a tag pipeline, so
# other projects can simply use that instead of computing the slug.
if
[
-n
"
$CI_COMMIT_TAG
"
]
;
then
docker tag
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_REF_SLUG
}
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_REF_NAME
}
docker push
${
ASSETS_IMAGE_PATH
}
:
${
CI_COMMIT_REF_NAME
}
fi
scripts/trigger-build
View file @
24426f37
...
@@ -141,7 +141,7 @@ module Trigger
...
@@ -141,7 +141,7 @@ module Trigger
"GITLAB_
#{
edition
}
_VERSION"
=>
ENV
[
'CI_COMMIT_REF_NAME'
],
"GITLAB_
#{
edition
}
_VERSION"
=>
ENV
[
'CI_COMMIT_REF_NAME'
],
"GITLAB_VERSION"
=>
ENV
[
'CI_COMMIT_REF_NAME'
],
"GITLAB_VERSION"
=>
ENV
[
'CI_COMMIT_REF_NAME'
],
"GITLAB_TAG"
=>
ENV
[
'CI_COMMIT_TAG'
],
"GITLAB_TAG"
=>
ENV
[
'CI_COMMIT_TAG'
],
"GITLAB_ASSETS_TAG"
=>
ENV
[
'CI_COMMIT_REF_SLUG'
],
"GITLAB_ASSETS_TAG"
=>
ENV
[
'CI_COMMIT_
TAG'
]
?
ENV
[
'CI_COMMIT_REF_NAME'
]
:
ENV
[
'CI_COMMIT_
REF_SLUG'
],
"
#{
edition
}
_PIPELINE"
=>
'true'
"
#{
edition
}
_PIPELINE"
=>
'true'
}
}
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment