Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Docker for Drupal
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
Package Registry
Model registry
Operate
Terraform modules
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
Composer
plugin
Docker for Drupal
Commits
7b0ef1e2
Commit
7b0ef1e2
authored
4 years ago
by
jurgenhaas
Browse files
Options
Downloads
Patches
Plain Diff
Undo last change which was just wrong and change PHP default to 7.3
parent
6f71ebed
No related branches found
Branches containing commit
Tags
v3.7.40
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/Handler.php
+4
-4
4 additions, 4 deletions
src/Handler.php
with
4 additions
and
4 deletions
src/Handler.php
+
4
−
4
View file @
7b0ef1e2
...
@@ -227,7 +227,7 @@ class Handler extends BaseHandler {
...
@@ -227,7 +227,7 @@ class Handler extends BaseHandler {
$env
->
put
(
'COMPOSE_PROJECT_NAME'
,
$projectname
);
$env
->
put
(
'COMPOSE_PROJECT_NAME'
,
$projectname
);
}
}
$extra
=
$this
->
composer
->
getPackage
()
->
getExtra
()
+
[
'docker4drupal'
=>
[]];
$extra
=
$this
->
composer
->
getPackage
()
->
getExtra
()
+
[
'docker4drupal'
=>
[]];
$options
=
NestedArray
::
mergeDeep
(
$extra
[
'docker4drupal'
],
[
$options
=
NestedArray
::
mergeDeep
([
'projectname'
=>
$projectname
,
'projectname'
=>
$projectname
,
'ci_home'
=>
'/home/gitlab-runner'
,
'ci_home'
=>
'/home/gitlab-runner'
,
'docker0'
=>
[
'docker0'
=>
[
...
@@ -263,7 +263,7 @@ class Handler extends BaseHandler {
...
@@ -263,7 +263,7 @@ class Handler extends BaseHandler {
'version'
=>
'8'
,
'version'
=>
'8'
,
],
],
'php'
=>
[
'php'
=>
[
'version'
=>
$env
->
receiveGlobal
(
'PHP_VERSION'
,
'PHP version'
,
'7.
2
'
),
'version'
=>
$env
->
receiveGlobal
(
'PHP_VERSION'
,
'PHP version'
,
'7.
3
'
),
'xdebug'
=>
$env
->
receiveGlobal
(
'PHP_DEBUG'
,
'PHP debug'
,
'0'
),
'xdebug'
=>
$env
->
receiveGlobal
(
'PHP_DEBUG'
,
'PHP debug'
,
'0'
),
],
],
'webserver'
=>
[
'webserver'
=>
[
...
@@ -309,7 +309,7 @@ class Handler extends BaseHandler {
...
@@ -309,7 +309,7 @@ class Handler extends BaseHandler {
'wkhtmltox'
=>
[
'wkhtmltox'
=>
[
'enable'
=>
0
,
'enable'
=>
0
,
],
],
]);
],
$extra
[
'docker4drupal'
]);
if
(
$this
->
isCiContext
()
||
$this
->
isLocalDevMode
())
{
if
(
$this
->
isCiContext
()
||
$this
->
isLocalDevMode
())
{
$projectRoot
=
$this
->
getDockerMountSource
(
getenv
(
'CI_PROJECT_DIR'
));
$projectRoot
=
$this
->
getDockerMountSource
(
getenv
(
'CI_PROJECT_DIR'
));
...
@@ -329,7 +329,7 @@ class Handler extends BaseHandler {
...
@@ -329,7 +329,7 @@ class Handler extends BaseHandler {
$options
[
'projectroot'
]
=
$projectRoot
;
$options
[
'projectroot'
]
=
$projectRoot
;
$this
->
options
=
$env
->
replaceEnvironmentVariables
(
$options
);
$this
->
options
=
$env
->
replaceEnvironmentVariables
(
$options
);
$env
->
put
(
'PHP_VERSION'
,
$this
->
options
[
'php'
][
'version'
],
TRUE
);
$env
->
put
(
'PHP_VERSION'
,
$this
->
options
[
'php'
][
'version'
],
TRUE
);
}
}
if
(
$key
!==
NULL
)
{
if
(
$key
!==
NULL
)
{
...
...
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