Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupalci_environments
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
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
project
drupalci_environments
Commits
a651bb00
Commit
a651bb00
authored
2 months ago
by
Max Whitehead
Committed by
Andrey Postnikov
2 months ago
Browse files
Options
Downloads
Patches
Plain Diff
Auth and switch to gitlab.com registry instead of dockerhub.
parent
aa51d0a3
No related branches found
No related tags found
No related merge requests found
Pipeline
#463847
passed
2 months ago
Stage: build
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
build_containers.sh
+2
-2
2 additions, 2 deletions
build_containers.sh
build_head_containers.sh
+2
-2
2 additions, 2 deletions
build_head_containers.sh
build_nightly.sh
+2
-2
2 additions, 2 deletions
build_nightly.sh
with
7 additions
and
7 deletions
.gitlab-ci.yml
+
1
−
1
View file @
a651bb00
...
...
@@ -77,7 +77,7 @@ stages:
-
ln -s buildah /usr/bin/docker
-
dnf install -y --nodocs git
-
git config --global --add safe.directory $(pwd)
-
echo "${
DOCKER_HUB
_PASSWORD}" | buildah login -u "${
DOCKER_HUB
_USER}" --password-stdin
docker.io
-
echo "${
REGISTRY
_PASSWORD}" | buildah login -u "${
REGISTRY
_USER
NAME
}" --password-stdin
registry.gitlab.com
-
|
if [ "$CI_PIPELINE_SOURCE" == "schedule" ]; then
echo 'Running nightly build script'
...
...
This diff is collapsed.
Click to expand it.
build_containers.sh
+
2
−
2
View file @
a651bb00
...
...
@@ -15,10 +15,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for
DOCKERFILE
in
"
${
DOCKERFILES
[@]
}
"
do
DOCKERTAG
=
$(
echo
${
DOCKERFILE
}
|
awk
'BEGIN {FS="/";} {print $1"-"$2}'
)
docker build
-t
drupalci
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
docker build
-t
${
REGISTRY_PATH
}
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
BUILDRESULT
=
$?
if
[
${
BUILDRESULT
}
-eq
0
]
;
then
docker push
drupalci
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
docker push
${
REGISTRY_PATH
}
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
#TODO: this currently assumes that the only containers we are working on are the php containers.
# Legacy from when this was a Jenkins script
#if [ "${GITBRANCH}" != "production" ]; then
...
...
This diff is collapsed.
Click to expand it.
build_head_containers.sh
+
2
−
2
View file @
a651bb00
...
...
@@ -17,10 +17,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for
DOCKERFILE
in
"
${
DOCKERFILES
[@]
}
"
do
DOCKERTAG
=
$(
echo
${
DOCKERFILE
}
|
awk
'BEGIN {FS="/";} {print $1"-"$2}'
)
docker build
--no-cache
-t
drupalci
/
${
DOCKERTAG
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
docker build
--no-cache
-t
${
REGISTRY_PATH
}
/
${
DOCKERTAG
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
BUILDRESULT
=
$?
if
[
${
BUILDRESULT
}
-eq
0
]
;
then
docker push
drupalci
/
${
DOCKERTAG
}
:
${
GITBRANCH
}
docker push
${
REGISTRY_PATH
}
/
${
DOCKERTAG
}
:
${
GITBRANCH
}
fi
done
fi
...
...
This diff is collapsed.
Click to expand it.
build_nightly.sh
+
2
−
2
View file @
a651bb00
...
...
@@ -13,10 +13,10 @@ if [[ ! -z "${DOCKERFILES-}" ]]; then
for
DOCKERFILE
in
"
${
DOCKERFILES
[@]
}
"
do
DOCKERTAG
=
$(
echo
${
DOCKERFILE
}
|
awk
'BEGIN {FS="/";} {print $1"-"$2}'
)
docker build
-t
drupalci
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
docker build
-t
${
REGISTRY_PATH
}
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
./
${
DOCKERFILE
%/Dockerfile
}
BUILDRESULT
=
$?
if
[
${
BUILDRESULT
}
-eq
0
]
;
then
docker push
drupalci
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
docker push
${
REGISTRY_PATH
}
/
${
DOCKERTAG
#db-
}
:
${
GITBRANCH
}
fi
done
fi
This diff is collapsed.
Click to expand it.
Andrey Postnikov
@andypost
mentioned in merge request
!53 (merged)
·
2 months ago
mentioned in merge request
!53 (merged)
mentioned in merge request !53
Toggle commit list
Andrey Postnikov
@andypost
mentioned in commit
f266196b
·
2 months ago
mentioned in commit
f266196b
mentioned in commit f266196bab2c12fd899052f7da482c38ade0498b
Toggle commit list
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