Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
engine-core
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
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
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
AURA
engine-core
Commits
9dca1abe
Commit
9dca1abe
authored
1 year ago
by
Chris Pastl
Browse files
Options
Downloads
Patches
Plain Diff
Revert "feat(DOCKER): Use docker main tag"
This reverts commit
0a589732
.
parent
a6203cd4
No related branches found
No related tags found
1 merge request
!13
Fix docker image names for release
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
.gitlab-ci.yml
+18
-13
18 additions, 13 deletions
.gitlab-ci.yml
with
18 additions
and
13 deletions
.gitlab-ci.yml
+
18
−
13
View file @
9dca1abe
...
@@ -47,30 +47,35 @@ docker-push:
...
@@ -47,30 +47,35 @@ docker-push:
AURA_IMAGE_NAME
:
"
autoradio/engine-core"
AURA_IMAGE_NAME
:
"
autoradio/engine-core"
services
:
services
:
-
docker:dind
-
docker:dind
before_script
:
# on a feature branch will login to gitlab registry
# else to docker hub
# hint: feature branches must begin with "feat"
-
|
if expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
then docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
else docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
fi
script
:
script
:
# every commit on main branch should build and push image as unstable
# every commit on main branch should build and push image as unstable
# elseif its a
protected
branch and push to gitlab registry
# elseif its a
feature
branch
build
and push to gitlab registry
# else it is from a tag (enforced by gitlab-ci rules)
# else it is from a tag (enforced by gitlab-ci rules)
# hint: tags are references independent of branches
# hint: tags are references independent of branches
# hint: feature branches must begin with "feat"
# hint: feature branches must begin with "feat"
-
|
-
|
if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
if [ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]
then docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
then docker build -t $AURA_IMAGE_NAME:unstable .
docker build -t $AURA_IMAGE_NAME:main -t $AURA_IMAGE_NAME:main-$CI_COMMIT_SHORT_SHA .
docker push $AURA_IMAGE_NAME:unstable
docker push --all-tags $AURA_IMAGE_NAME
elif expr "$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME" : ^feat > /dev/null
elif [ "$CI_COMMIT_REF_PROTECTED" = "true" ] && [ "$CI_COMMIT_BRANCH" != "$CI_DEFAULT_BRANCH" ]
then docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME .
then docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
docker push $CI_REGISTRY_IMAGE:$CI_MERGE_REQUEST_SOURCE_BRANCH_NAME
docker build -t $AURA_IMAGE_NAME -t $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA .
else docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHORT_SHA
docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
else
docker login -u "$DOCKER_ID" -p "$DOCKER_HUB_AUTH"
docker build -t $AURA_IMAGE_NAME -t $AURA_IMAGE_NAME:$CI_COMMIT_TAG .
docker push $AURA_IMAGE_NAME:$CI_COMMIT_TAG
fi
fi
rules
:
rules
:
-
*release-rules
-
*release-rules
# every commit on master/main or feature branch should trigger a push
# every commit on master/main or feature branch should trigger a push
-
if
:
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_
COMMIT_REF_PROTECTED =~ "true"
-
if
:
$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_
MERGE_REQUEST_SOURCE_BRANCH_NAME =~ /^feat/
exists
:
exists
:
-
Dockerfile
-
Dockerfile
...
...
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