Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
RoninDojo
samourai-dojo
Commits
cd3bca6c
Commit
cd3bca6c
authored
Nov 14, 2021
by
likewhoa
Browse files
Merge branch 'compose_fix' into 'develop'
Configure docker compose to use version 1 See merge request
!7
parents
ba71cdab
3a0a3b94
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
0 deletions
+9
-0
docker/my-dojo/dojo.sh
docker/my-dojo/dojo.sh
+9
-0
No files found.
docker/my-dojo/dojo.sh
View file @
cd3bca6c
...
...
@@ -57,6 +57,11 @@ select_yaml_files() {
echo
"
$yamlFiles
"
}
# Disable docker compose v2
configure_docker_compose
()
{
docker-compose
--version
|
grep
"v2"
>
/dev/null
&&
docker-compose disable-v2
}
# Docker up
docker_up
()
{
yamlFiles
=
$(
select_yaml_files
)
...
...
@@ -201,6 +206,8 @@ install() {
# Installation
if
[
$launchInstall
-eq
0
]
;
then
# Disable docker compose v2
configure_docker_compose
# Initialize the config files
init_config_files
# Build and start Dojo
...
...
@@ -314,6 +321,8 @@ upgrade() {
# Upgrade Dojo
if
[
$launchUpgrade
-eq
0
]
;
then
# Disable docker compose v2
configure_docker_compose
# Select yaml files
yamlFiles
=
$(
select_yaml_files
)
# Check if dojo is running (check the db container)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment