Move Docker container configuration to compose.yml

docker/README.md

@@ -17,7 +17,7 @@ This procedure is used to create a new Docker container that hosts the Adamant b
    $ git clone https://github.com/lasp/adamant.git
    ```
 
- 3. Next, tell Docker to create a new container from the [pre-built image](https://github.com/lasp/adamant/pkgs/container/adamant). This make take a few minutes and ~3 GB of disk space. By default, the container created is named `adamant_container`. To change this, or the image that the container uses, modify `docker_config.sh` before running the commands below.
+ 3. Next, tell Docker to create a new container from the [pre-built image](https://github.com/lasp/adamant/pkgs/container/adamant). This make take a few minutes and ~3 GB of disk space. By default, the container created is named `adamant_container`. To change this, or the image that the container uses, modify `compose.yml` before running the commands below.
 
    ```
    $ cd adamant/docker
@@ -77,4 +77,4 @@ Next, you can create the Docker image by running:
    $ ./adamant_env.sh build
    ```
 
-This may take several minutes complete. By default, the image created is named `ghcr.io/lasp/adamant:latest`. To change this, modify `docker_config.sh` before running `./adamant_env.sh build`.
+This may take several minutes complete. By default, the image created is named `ghcr.io/lasp/adamant:latest`. To change this, modify `compose.yml` before running `./adamant_env.sh build`.

docker/adamant_env.sh

@@ -19,7 +19,6 @@ fi
 
 set -e
 
-. ${this_dir}/docker_config.sh
 PROJECT_NAME=${this_dir%/*}
 PROJECT_NAME=${PROJECT_NAME##*/}
 DOCKER_COMPOSE_COMMAND="docker compose"
@@ -32,6 +31,12 @@ if [ "$?" -ne 0 ]; then
   export DOCKER_COMPOSE_COMMAND="docker-compose"
 fi
 
+# Helper function to print out command as executed:
+execute () {
+  echo "$ $@"
+  eval "$@"
+}
+
 usage() {
   echo "Usage: $1 [start, stop, login, push, build, remove]" >&2
   echo "*  start: create and start the ${PROJECT_NAME} container" >&2
@@ -45,7 +50,7 @@ usage() {
 
 case $1 in
   start )
-    execute "${DOCKER_COMPOSE_COMMAND} -f ${DOCKER_COMPOSE_CONFIG} up -d"
+    execute "${DOCKER_COMPOSE_COMMAND} -f ${DOCKER_COMPOSE_CONFIG} up --pull \"missing\" -d"
     execute "${DOCKER_COMPOSE_COMMAND} -f ${DOCKER_COMPOSE_CONFIG} exec ${PROJECT_NAME} bash -c \"\
       if [ ! -f /home/user/.initialized ]; \
       then source /home/user/adamant/env/activate && touch /home/user/.initialized; \

docker/compose.yml

@@ -1,15 +1,15 @@
 name: adamant
 services:
     adamant:
-        container_name: ${DOCKER_CONTAINER_NAME}
+        container_name: adamant_container
         volumes:
             - type: bind
               source: ../../adamant
               target: /home/user/adamant
         extra_hosts:
             - host.docker.internal:host-gateway
         network_mode: host
-        image: ${DOCKER_IMAGE_NAME}
+        image: ghcr.io/lasp/adamant:latest
         build:
             context: .
         command: sleep infinity