Selaa lähdekoodia

chore: Rename docker compose files

Owen Diffey 2 viikkoa sitten
vanhempi
commit
625c44d711
6 muutettua tiedostoa jossa 11 lisäystä ja 9 poistoa
  1. 1 0
      .gitignore
  2. 3 3
      .wiki/Configuration.md
  3. 0 0
      compose.dev.yml
  4. 0 0
      compose.local.yml
  5. 0 2
      compose.yml
  6. 7 4
      musare.sh

+ 1 - 0
.gitignore

@@ -13,6 +13,7 @@ startMongo.cmd
 .redis
 *.rdb
 backups/
+compose.override.yml
 docker-compose.override.yml
 
 npm-debug.log

+ 3 - 3
.wiki/Configuration.md

@@ -157,10 +157,10 @@ For more information on configuration files please refer to the
 | `experimental.soundcloud` | Experimental SoundCloud integration. |
 | `experimental.spotify` | Experimental Spotify integration. |
 
-## Docker-compose override
+## Docker compose override
 
-You may want to override the docker-compose files in some specific cases.  
-For this, you can create a `docker-compose.override.yml` file.
+You may want to override the docker compose files in some specific cases.
+For this, you can create a `compose.override.yml` file.
 
 For example, to expose the frontend port:
 

+ 0 - 0
docker-compose.dev.yml → compose.dev.yml


+ 0 - 0
docker-compose.local.yml → compose.local.yml


+ 0 - 2
docker-compose.yml → compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   backend:
     build:

+ 7 - 4
musare.sh

@@ -50,14 +50,17 @@ if [[ ${dockerInstalled} -gt 0 || ${composeInstalled} -gt 0 ]]; then
     exit 1
 fi
 
-composeFiles="-f docker-compose.yml"
+# Add docker compose file arguments to command
+composeFiles="-f compose.yml"
 if [[ ${APP_ENV} == "development" ]]; then
-    composeFiles="${composeFiles} -f docker-compose.dev.yml"
+    composeFiles="${composeFiles} -f compose.dev.yml"
 fi
 if [[ ${CONTAINER_MODE} == "local" ]]; then
-    composeFiles="${composeFiles} -f docker-compose.local.yml"
+    composeFiles="${composeFiles} -f compose.local.yml"
 fi
-if [[ -f docker-compose.override.yml ]]; then
+if [[ -f compose.override.yml ]]; then
+    composeFiles="${composeFiles} -f compose.override.yml"
+elif [[ -f docker-compose.override.yml ]]; then
     composeFiles="${composeFiles} -f docker-compose.override.yml"
 fi
 dockerCompose="${dockerCompose} ${composeFiles}"