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
4b2a1daa
Commit
4b2a1daa
authored
4 years ago
by
jurgenhaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'release/v1.13.1' into master
parents
fbaca40a
ec8f93ce
No related branches found
Branches containing commit
Tags
v1.12.7
Tags containing commit
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
CHANGELOG
+8
-0
8 additions, 0 deletions
CHANGELOG
run/scripts/start
+1
-0
1 addition, 0 deletions
run/scripts/start
setup/scripts/l3d
+1
-0
1 addition, 0 deletions
setup/scripts/l3d
start.sh
+24
-8
24 additions, 8 deletions
start.sh
with
34 additions
and
8 deletions
CHANGELOG
+
8
−
0
View file @
4b2a1daa
v1.13.1 2020-07-15
------------------
Map the local .gitignore_global into containers
v1.13.0 2020-07-20
------------------
Add support for Drupal 9 project templates
v1.12.8 2020-05-22
------------------
Force update to update to base image v1.4.4
...
...
This diff is collapsed.
Click to expand it.
run/scripts/start
+
1
−
0
View file @
4b2a1daa
...
...
@@ -35,6 +35,7 @@ function startContainer {
--volume
${
SSHAUTH
}
:
${
SSHAUTHSOCK
}
\
--volume
${
HOMEDIR
}
/.traefik:/root/.traefik
\
--volume
${
HOMEDIR
}
/.gitconfig:/root/.gitconfig
\
--volume
${
HOMEDIR
}
/.gitignore_global:/root/.gitignore_global
\
--volume
${
HOMEDIR
}
/.composer/auth.json:/root/.composer/auth.json
\
--workdir
/drupal
\
--restart
unless-stopped
\
...
...
This diff is collapsed.
Click to expand it.
setup/scripts/l3d
+
1
−
0
View file @
4b2a1daa
...
...
@@ -25,6 +25,7 @@ esac
mkdir
-p
${
HOME
}
/.composer
touch
${
HOME
}
/.composer/auth.json
touch
${
HOME
}
/.gitconfig
touch
${
HOME
}
/.gitignore_global
ID
=
$(
docker container
ls
--all
-q
-f
name
=
^l3drun
$)
if
[[
!
-n
${
ID
}
]]
;
then
...
...
This diff is collapsed.
Click to expand it.
start.sh
+
24
−
8
View file @
4b2a1daa
...
...
@@ -55,7 +55,7 @@ function create {
# Start container
a d4d up
sleep
2
drush
--no-interaction
si
config_installer
drush
--no-interaction
si
${
SITE_INSTALL_ARGS
}
# Init site config values
if
[[
-f
"drush/Commands/dev_modules/dev_modules.info.yml"
]]
;
then
...
...
@@ -110,10 +110,12 @@ function initialSetup {
echo
""
echo
"Options to start:"
echo
" 0 none: start with an empty container"
echo
" 1 LakeDrops Drupal 8 project template"
echo
" 2 Drupal's community project template"
echo
" 3 Custom project template"
echo
" 4 Existing git repository"
echo
" 1 LakeDrops Drupal 9 project template"
echo
" 2 LakeDrops Drupal 8 project template"
echo
" 3 drupal.org recommended project template (Drupal 9)"
echo
" 4 Drupal's community project template (Drupal 8)"
echo
" 5 Custom project template"
echo
" 6 Existing git repository"
echo
""
echo
""
...
...
@@ -128,18 +130,32 @@ function initialSetup {
;;
1
)
PROJECT
=
"lakedrops/d8-project"
PROJECT
=
"lakedrops/d9-project"
SITE_INSTALL_ARGS
=
"--existing-config"
create
break
;;
2
)
PROJECT
=
"drupal-composer/drupal-project:8.x-dev"
PROJECT
=
"lakedrops/d8-project"
SITE_INSTALL_ARGS
=
"config_installer"
create
break
;;
3
)
PROJECT
=
"drupal/recommended-project"
create
break
;;
4
)
PROJECT
=
"drupal-composer/drupal-project:8.x-dev"
create
break
;;
5
)
# shellcheck disable=SC2162
read
-p
"Custom project template: "
PROJECT
# shellcheck disable=SC2162
...
...
@@ -148,7 +164,7 @@ function initialSetup {
break
;;
4
)
6
)
# shellcheck disable=SC2162
read
-p
"Repository URL: "
REPOSITORY
if
[[
-n
"
${
REPOSITORY
}
"
]]
;
then
...
...
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