Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GitLab Drupal CI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
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
Docker
GitLab Drupal CI
Merge requests
!65
Merging develop into main
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Merging develop into main
develop
into
main
Overview
0
Commits
4
Pipelines
0
Changes
1
Merged
jurgenhaas
requested to merge
develop
into
main
1 year ago
Overview
0
Commits
4
Pipelines
0
Changes
1
Expand
Add a note about docker compose version
#49
Pull latest backstop image before running it
Update yq to version 4.42.1
Downgrade docker compose to 2.24.5 due to
https://github.com/docker/compose/issues/11533
0
0
Merge request reports
Viewing commit
0e42c0ef
Prev
Next
Show latest version
1 file
+
2
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
0e42c0ef
Update yq to version 4.42.1
· 0e42c0ef
jurgenhaas
authored
1 year ago
Dockerfile
+
2
−
1
Options
@@ -25,6 +25,7 @@ ARG compose_version=2.24.6
ARG
composer_version=2.7.1
ARG
dockerArch
ARG
glibc_version=2.35-r1
ARG
yq_version=4.42.1
ADD
usrbin/column /usr/bin/column
ADD
bin/* /usr/local/bin/
@@ -53,7 +54,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
tar
--extract
--file
docker.tgz
--strip-components
1
--directory
/usr/local/bin/
&&
\
rm
docker.tgz
&&
\
\
if
!
curl
-fSL
-o
/usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/v
4.26.1
/yq_linux_386"
;
then
\
if
!
curl
-fSL
-o
/usr/local/bin/yq
"https://github.com/mikefarah/yq/releases/download/v
${
yq_version
}
/yq_linux_386"
;
then
\
echo
>
&2
"error: failed to download 'yq'"
;
\
exit
1
;
\
fi
&&
\
Loading