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
Commits
b00a61d5
Commit
b00a61d5
authored
1 year ago
by
jurgenhaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
Merging develop into main See merge request
!64
parents
2d67b00d
a3d6ad78
No related branches found
Branches containing commit
Tags
v2.2.15
Tags containing commit
1 merge request
!64
Merging develop into main
Pipeline
#1171722
passed
1 year ago
Stage: build
Changes
1
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Dockerfile
+12
-8
12 additions, 8 deletions
Dockerfile
with
12 additions
and
8 deletions
Dockerfile
+
12
−
8
View file @
b00a61d5
...
...
@@ -12,17 +12,18 @@ LABEL com.example.vendor="LakeDrops" \
ARG
ALPINE_VERSION
ARG
PHP_MAJOR_VERSION
ARG
compose_version=2.24.5
ARG
buildx_version=0.12.1
ARG
glibc_version=2.35-r1
ARG
apkArch
ARG
dockerArch
ARG
AHOY_VERSION=2.1.1
ARG
DIFFTASTIC_VERSION=0.55.0
ARG
DOCKER_CHANNEL=stable
ARG
DOCKER_VERSION=24.0.7
ARG
GIT_EXTRAS_VERSION=7.1.0
ARG
AHOY_VERSION=2.1.1
ARG
GLAB_VERSION=1.36.0
ARG
DIFFTASTIC_VERSION=0.55.0
ARG
apkArch
ARG
buildx_version=0.12.1
ARG
compose_version=2.24.6
ARG
composer_version=2.7.1
ARG
dockerArch
ARG
glibc_version=2.35-r1
ADD
usrbin/column /usr/bin/column
ADD
bin/* /usr/local/bin/
...
...
@@ -85,6 +86,9 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
\
pip
install
wheel
&&
\
pip
install
jc
&&
\
pip
install
PyYaml
&&
\
pip
install
python-gitlab
&&
\
pip
install
visidata
&&
\
\
wget
-q
https://gitlab.com/gitlab-org/cli/-/releases/v
${
GLAB_VERSION
}
/downloads/glab_
${
GLAB_VERSION
}
_Linux_x86_64.apk
&&
\
apk add
--no-cache
--allow-untrusted
glab_
${
GLAB_VERSION
}
_Linux_x86_64.apk
&&
\
...
...
@@ -129,7 +133,7 @@ RUN echo 'hosts: files dns' > /etc/nsswitch.conf && \
mv
/usr/local/etc/php/php.ini-development /usr/local/etc/php/php.ini
&&
\
sed
-i
-e
's/memory_limit = 128M/memory_limit = -1/g'
/usr/local/etc/php/php.ini
&&
\
\
composer selfupdate
&&
\
composer selfupdate
$composer_version
&&
\
\
git config
--global
--add
safe.directory
'*'
&&
\
\
...
...
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