From 9b130b5963c0da33dc32894e5197398c6d387c67 Mon Sep 17 00:00:00 2001 From: Kevin Dinkel <1225857+dinkelk@users.noreply.github.com> Date: Mon, 24 Jun 2024 07:48:02 -0600 Subject: [PATCH] Rename compose.yml file to default "docker-compose.yml" --- docker/README.md | 4 ++-- docker/adamant_env.sh | 2 +- docker/{compose.yml => docker-compose.yml} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename docker/{compose.yml => docker-compose.yml} (100%) diff --git a/docker/README.md b/docker/README.md index b22b634c..d63eae8f 100644 --- a/docker/README.md +++ b/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 `compose.yml` 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 `docker-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 `compose.yml` 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 `docker-compose.yml` before running `./adamant_env.sh build`. diff --git a/docker/adamant_env.sh b/docker/adamant_env.sh index 2a255359..db06f079 100755 --- a/docker/adamant_env.sh +++ b/docker/adamant_env.sh @@ -22,7 +22,7 @@ set -e PROJECT_NAME=${this_dir%/*} PROJECT_NAME=${PROJECT_NAME##*/} DOCKER_COMPOSE_COMMAND="docker compose" -DOCKER_COMPOSE_CONFIG="${this_dir}/compose.yml" +DOCKER_COMPOSE_CONFIG="${this_dir}/docker-compose.yml" export PROJECT_NAME export DOCKER_COMPOSE_COMMAND export DOCKER_COMPOSE_CONFIG diff --git a/docker/compose.yml b/docker/docker-compose.yml similarity index 100% rename from docker/compose.yml rename to docker/docker-compose.yml