Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
L
LakeDropsDrupalDev
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
LakeDropsDrupalDev
Commits
bbdef232
Commit
bbdef232
authored
4 years ago
by
danielspeicher
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/v1.15.2'
parents
97b20b9a
8112ce8e
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup/scripts/l3d
+1
-1
1 addition, 1 deletion
setup/scripts/l3d
start.sh
+3
-0
3 additions, 0 deletions
start.sh
with
4 additions
and
1 deletion
setup/scripts/l3d
+
1
−
1
View file @
bbdef232
...
...
@@ -24,7 +24,7 @@ esac
mkdir
-p
${
HOME
}
/.composer
touch
${
HOME
}
/.composer/auth.json
if
[[
-s
"
${
HOME
}
/.composer/auth.json"
]]
;
then
if
[[
!
-s
"
${
HOME
}
/.composer/auth.json"
]]
;
then
echo
"{}"
>
${
HOME
}
/.composer/auth.json
fi
touch
${
HOME
}
/.gitconfig
...
...
This diff is collapsed.
Click to expand it.
start.sh
+
3
−
0
View file @
bbdef232
...
...
@@ -28,6 +28,9 @@ function restoreEnvFile {
if
[[
-n
${
COMPOSE_PROJECT_NAME
}
]]
;
then
echo
"COMPOSE_PROJECT_NAME=
${
COMPOSE_PROJECT_NAME
}
"
>>
.env
fi
if
[[
-n
${
COMPOSER_DOWNGRADE
}
]]
;
then
echo
"COMPOSER_DOWNGRADE=
${
COMPOSER_DOWNGRADE
}
"
>>
.env
fi
if
[[
-f
".env"
]]
;
then
# shellcheck disable=SC2046
# shellcheck disable=SC2094
...
...
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