Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
workspaces
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
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
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ssa
workspaces
Commits
3195afd8
Commit
3195afd8
authored
1 year ago
by
Brittany Faciane
Browse files
Options
Downloads
Patches
Plain Diff
Finish changing images over to marconi naming scheme
parent
fd751925
No related branches found
Branches containing commit
Tags
2.5.0-rc2
Tags containing commit
2 merge requests
!1452
Merge 2.8.2 to main
,
!1339
No Story: Revert package registry back to marconi.
Pipeline
#9763
passed
1 year ago
Stage: pull-db
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+2
-2
2 additions, 2 deletions
.gitlab-ci.yml
ci/build.template.yml
+2
-2
2 additions, 2 deletions
ci/build.template.yml
ci/cleanup.template.yml
+2
-2
2 additions, 2 deletions
ci/cleanup.template.yml
ci/push.template.yml
+1
-1
1 addition, 1 deletion
ci/push.template.yml
with
7 additions
and
7 deletions
.gitlab-ci.yml
+
2
−
2
View file @
3195afd8
...
...
@@ -49,7 +49,7 @@ pull db image:
stage
:
pull-db
script
:
-
echo "$HARBOR_PASSWORD" | docker login --username "$HARBOR_USER" --password-stdin "$REGISTRY_URL"
-
docker pull ${REGISTRY_URL}/db:workspaces
-
docker pull ${REGISTRY_URL}/
workspaces/
db:workspaces
###############################################
# Build Pexes
...
...
@@ -437,7 +437,7 @@ go child pipeline:
# This sed command finds and replaces "dsoc_ENV_secrets:" with "dsoc_${DEPLOY_ENV}_secrets:"
-
sed -i "s/dsoc_ENV_secrets:/dsoc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
-
sed -i "s/naasc_ENV_secrets:/naasc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
-
ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST
BASE_REGISTRY_URL=$BASE_REGISTRY_URL
docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV} -e TAG=${IMAGE_TAG}
-
ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV} -e TAG=${IMAGE_TAG}
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH
||
$CI_COMMIT_BRANCH
=~
/(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
variables
:
...
...
This diff is collapsed.
Click to expand it.
ci/build.template.yml
+
2
−
2
View file @
3195afd8
...
...
@@ -2,8 +2,8 @@
.build
:
script
:
-
echo "Building branch or tag -- ${IMAGE_TAG}"
-
NAME="${
BASE_
REGISTRY_URL}/${SERVICE_NAME}"
-
docker build -t ${NAME}:${IMAGE_TAG} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg DEPLOY_ENV --build-arg WS_VERSION=${VERSION} --build-arg
BASE_REGISTRY_URL --build-arg
CAPO_PROFILE=prod --target prod
-
NAME="${REGISTRY_URL}/
workspaces/
${SERVICE_NAME}"
-
docker build -t ${NAME}:${IMAGE_TAG} -f ${PATH_PREFIX}${SERVICE_NAME}/Dockerfile . --build-arg DEPLOY_ENV --build-arg WS_VERSION=${VERSION} --build-arg CAPO_PROFILE=prod --target prod
-
echo "TAG=${IMAGE_TAG}" >> build.env
artifacts
:
reports
:
...
...
This diff is collapsed.
Click to expand it.
ci/cleanup.template.yml
+
2
−
2
View file @
3195afd8
# Cleanup Images Template
.cleanup
:
script
:
-
NAME="${REGISTRY_URL}/${SERVICE_NAME}"
-
NAME="${REGISTRY_URL}/
workspaces/
${SERVICE_NAME}"
-
|
printf "%s\n" "- Removing Images -" \
"${NAME}:${IMAGE_TAG}"
-
docker image rm --force "${REGISTRY_URL}/${SERVICE_NAME}:${IMAGE_TAG}"
-
docker image rm --force "${REGISTRY_URL}/
workspaces/
${SERVICE_NAME}:${IMAGE_TAG}"
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH
||
$CI_COMMIT_BRANCH
=~
/(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
variables
:
...
...
This diff is collapsed.
Click to expand it.
ci/push.template.yml
+
1
−
1
View file @
3195afd8
...
...
@@ -2,7 +2,7 @@
.push
:
script
:
-
echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
-
NAME="${$REGISTRY_URL}/${SERVICE_NAME}"
-
NAME="${$REGISTRY_URL}/
workspaces/
${SERVICE_NAME}"
-
docker push ${NAME}:${IMAGE_TAG}
rules
:
-
if
:
'
$CI_COMMIT_BRANCH
==
$CI_DEFAULT_BRANCH
||
$CI_COMMIT_BRANCH
=~
/(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
...
...
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