chore: bring docker-compose to root level (ietf-tools#3642) (ietf-tools#3643)

rjsparks · web-flow · commit aa718e7e9890 · 2022-03-14T17:17:31.000-05:00
Authored-by: Nicolas Giard &lt;github@ngpixel.com&gt;
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -2,7 +2,7 @@
 // https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/python-3
 {
     "name": "IETF Datatracker",
-    "dockerComposeFile": ["../docker/docker-compose.yml", "docker-compose.extend.yml"],
+    "dockerComposeFile": ["../docker-compose.yml", "docker-compose.extend.yml"],
     "service": "app",
     "workspaceFolder": "/root/src",
     "shutdownAction": "stopCompose",
diff --git a/.devcontainer/docker-compose.extend.yml b/.devcontainer/docker-compose.extend.yml
@@ -6,7 +6,7 @@ services:
             EDITOR_VSCODE: 1
             DJANGO_SETTINGS_MODULE: settings_local_sqlitetest
         volumes:
-            - ..:/root/src
+            - .:/root/src
             - /root/src/node_modules
         # Runs app on the same network as the database container, allows "forwardPorts" in devcontainer.json function.
         network_mode: service:db
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -3,7 +3,7 @@ version: '3.8'
 services:
     app:
         build:
-            context: ..
+            context: .
             dockerfile: docker/app.Dockerfile
             args:
                 # Update 'VARIANT' to pick a version of Python: 3, 3.10, 3.9, 3.8, 3.7, 3.6
diff --git a/docker/cleanall b/docker/cleanall
@@ -1,7 +1,9 @@
 #!/bin/bash
 
+cd ..
 echo "Shutting down any instance still running and purge images..."
 docker-compose down -v --rmi all
 echo "Purging dangling images..."
 docker image prune
+cd docker
 echo "Done!"
diff --git a/docker/cleandb b/docker/cleandb
@@ -1,8 +1,10 @@
 #!/bin/bash
 
 echo "Shutting down any instance still running..."
+cd ..
 docker-compose down -v
 echo "Rebuilding the DB image..."
 docker-compose pull db
 docker-compose build --no-cache db
+cd docker
 echo "Done!"
diff --git a/docker/docker-compose.extend.yml b/docker/docker-compose.extend.yml
@@ -5,7 +5,7 @@ services:
         ports:
             - '8000:8000'
         volumes:
-            - ..:/root/src
+            - .:/root/src
             - /root/src/node_modules
     db:
         ports:
diff --git a/docker/run b/docker/run
@@ -1,5 +1,7 @@
 #!/bin/bash
 
-docker-compose -f docker-compose.yml -f docker-compose.extend.yml up -d
+cd ..
+docker-compose -f docker-compose.yml -f docker/docker-compose.extend.yml up -d
 docker-compose exec app /bin/sh /docker-init.sh
 docker-compose down
+cd docker

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`// https://github.com/microsoft/vscode-dev-containers/tree/v0.202.5/containers/python-3`
`3`	`3`	`{`
`4`	`4`	`"name": "IETF Datatracker",`
`5`		`- "dockerComposeFile": ["../docker/docker-compose.yml", "docker-compose.extend.yml"],`
	`5`	`+ "dockerComposeFile": ["../docker-compose.yml", "docker-compose.extend.yml"],`
`6`	`6`	`"service": "app",`
`7`	`7`	`"workspaceFolder": "/root/src",`
`8`	`8`	`"shutdownAction": "stopCompose",`