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
138fed05
Commit
138fed05
authored
9 months ago
by
jurgenhaas
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' into 'main'
Merging develop into main See merge request
!49
parents
6cc1ec42
5145276f
No related branches found
No related tags found
1 merge request
!49
Merging develop into main
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+1
-1
1 addition, 1 deletion
.gitlab-ci.yml
start.sh
+10
-11
10 additions, 11 deletions
start.sh
with
11 additions
and
12 deletions
.gitlab-ci.yml
+
1
−
1
View file @
138fed05
...
...
@@ -5,7 +5,7 @@ include:
variables
:
VERSION
:
${CI_COMMIT_TAG}
CI_VERSION
:
v2.2.2
2
CI_VERSION
:
v2.2.2
3
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
...
...
This diff is collapsed.
Click to expand it.
start.sh
+
10
−
11
View file @
138fed05
...
...
@@ -123,12 +123,12 @@ function initialSetup {
echo
""
echo
"Options to start:"
echo
" 0 none: start with an empty container"
echo
" 1 LakeDrops Drupal 1
0
project template"
echo
" 2 LakeDrops Drupal
9
project template"
echo
" 3
LakeDrops Drupal 8
project template"
echo
" 1 LakeDrops Drupal 1
1
project template"
echo
" 2 LakeDrops Drupal
10
project template"
echo
" 3
drupal.org recommended
project template
(Drupal 11)
"
echo
" 4 drupal.org recommended project template (Drupal 10)"
echo
" 5
d
rupal
.org recommended
project template (Drupal
9
)"
echo
" 6 Drupal's community project template (Drupal
8
)"
echo
" 5
D
rupal
's community
project template (Drupal
11
)"
echo
" 6 Drupal's community project template (Drupal
10
)"
echo
" 7 Custom project template"
echo
" 8 Existing git repository"
echo
""
...
...
@@ -145,22 +145,21 @@ function initialSetup {
;;
1
)
PROJECT
=
"lakedrops/d1
0
-project"
PROJECT
=
"lakedrops/d1
1
-project"
SITE_INSTALL_ARGS
=
"--existing-config"
create
break
;;
2
)
PROJECT
=
"lakedrops/d
9
-project"
PROJECT
=
"lakedrops/d
10
-project"
SITE_INSTALL_ARGS
=
"--existing-config"
create
break
;;
3
)
PROJECT
=
"lakedrops/d8-project"
SITE_INSTALL_ARGS
=
"config_installer"
PROJECT
=
"drupal/recommended-project:^11"
create
break
;;
...
...
@@ -172,13 +171,13 @@ function initialSetup {
;;
5
)
PROJECT
=
"drupal
/recommended
-project:
^9
"
PROJECT
=
"drupal
-composer/drupal
-project:
11.x-dev
"
create
break
;;
6
)
PROJECT
=
"drupal-composer/drupal-project:
8
.x-dev"
PROJECT
=
"drupal-composer/drupal-project:
10
.x-dev"
create
break
;;
...
...
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