Move Dockerfile, docker-compose.yml to /

This is better, other tools can use them from /.

.devcontainer/devcontainer.json

@@ -1,12 +1,12 @@
 {
     "name": "r-app",
     "postCreateCommand": "service ssh start",
-    "dockerComposeFile": "docker-compose.yml",
+    "dockerComposeFile": "../docker-compose.yml",
     "service": "r-app",
     "shutdownAction": "stopCompose",
     // It is not mounted automatically if we use a compose file (?)
     "mounts": [{
-            "source": "..",
+            "source": ".",
             "target": "/workspaces/${localWorkspaceFolderBasename}",
             "type": "bind"
         }, {

.github/workflows/deploy.yml

@@ -22,7 +22,6 @@ jobs:
     - name: Build
       uses: docker/build-push-action@v6
       with:
-        file: .devcontainer/Dockerfile
         platforms: linux/amd64
         push: true
         target: prod

.github/workflows/test.yml

@@ -22,7 +22,6 @@ jobs:
     - name: Build
       uses: docker/build-push-action@v6
       with:
-        file: .devcontainer/Dockerfile
         platforms: linux/amd64
         push: false
         target: test

.gitignore

@@ -1,3 +1,4 @@
 /.quarto/
 /www
 /cache
+/.env

README.md

@@ -32,7 +32,7 @@ If you use Positron, then for the first time:
    ```
 1. Use a random port for SSH (optional).
    ```
-   echo PORT=2222 >> .devcontainer/.env
+   echo PORT=2222 >> .env
    ```
 1. Build and start the dev container:
    ```
@@ -60,7 +60,7 @@ Positron does not stop the container when it disconnects. The devcontainer
 cli also cannot stop it currently. To stop the container call docker
 directly:
 ```
-docker stop cran-metadata_devcontainer-r-app-1
+docker stop cran-metadata-r-app-1
 ```
 
 #### Restarting
@@ -74,8 +74,8 @@ devcontainer up --workspace-folder .
 
 To rebuild a container stop it and delete it before you build it again:
 ```
-docker stop cran-metadata_devcontainer-r-app-1
-docker rm cran-metadata_devcontainer-r-app-1
+docker stop cran-metadata-r-app-1
+docker rm cran-metadata-r-app-1
 devcontainer up --workspace-folder .
 ```
 

.devcontainer/docker-compose.yml → docker-compose.yml

@@ -1,8 +1,8 @@
 services:
   r-app:
     build:
-      dockerfile: .devcontainer/Dockerfile
-      context: ..
+      dockerfile: Dockerfile
+      context: .
     command: sleep infinity
     ports:
       - ${PORT:-2222}:2222