From 456a3f93bd4b1c46255860a0d2c23aa619831f37 Mon Sep 17 00:00:00 2001 From: strawberry Date: Tue, 23 Apr 2024 01:39:13 -0400 Subject: [PATCH] replace all mentions of docker compose v1 Signed-off-by: strawberry --- .dockerignore | 1 - docs/deploying/docker-compose.for-traefik.yml | 6 +++--- docs/deploying/docker-compose.override.yml | 2 +- docs/deploying/docker-compose.with-traefik.yml | 8 ++++---- docs/deploying/docker-compose.yml | 4 ++-- docs/deploying/docker.md | 2 +- 6 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.dockerignore b/.dockerignore index c78ddbac..35d35e1b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,7 +4,6 @@ tests # Docker files Dockerfile* -docker-compose* # IDE files .vscode diff --git a/docs/deploying/docker-compose.for-traefik.yml b/docs/deploying/docker-compose.for-traefik.yml index aa4c149c..f946dca9 100644 --- a/docs/deploying/docker-compose.for-traefik.yml +++ b/docs/deploying/docker-compose.for-traefik.yml @@ -7,8 +7,8 @@ services: ### then you are ready to go. image: girlbossceo/conduwuit:latest ### If you want to build a fresh image from the sources, then comment the image line and uncomment the - ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this: - ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d + ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this: + ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d # build: # context: . # args: @@ -40,7 +40,7 @@ services: # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container # to serve those two as static files. If you want to use a different way, delete or comment the below service, here - # and in the docker-compose override file. + # and in the docker compose override file. well-known: image: nginx:latest restart: unless-stopped diff --git a/docs/deploying/docker-compose.override.yml b/docs/deploying/docker-compose.override.yml index a41d0202..13a1c917 100644 --- a/docs/deploying/docker-compose.override.yml +++ b/docs/deploying/docker-compose.override.yml @@ -18,7 +18,7 @@ services: # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container # to serve those two as static files. If you want to use a different way, delete or comment the below service, here - # and in the docker-compose file. + # and in the docker compose file. well-known: labels: - "traefik.enable=true" diff --git a/docs/deploying/docker-compose.with-traefik.yml b/docs/deploying/docker-compose.with-traefik.yml index a7a0274e..d9ec1c29 100644 --- a/docs/deploying/docker-compose.with-traefik.yml +++ b/docs/deploying/docker-compose.with-traefik.yml @@ -7,8 +7,8 @@ services: ### then you are ready to go. image: girlbossceo/conduwuit:latest ### If you want to build a fresh image from the sources, then comment the image line and uncomment the - ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this: - ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d + ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this: + ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d # build: # context: . # args: @@ -43,7 +43,7 @@ services: # We need some way to server the client and server .well-known json. The simplest way is to use a nginx container # to serve those two as static files. If you want to use a different way, delete or comment the below service, here - # and in the docker-compose override file. + # and in the docker compose override file. well-known: image: nginx:latest restart: unless-stopped @@ -94,4 +94,4 @@ volumes: acme: networks: - proxy: \ No newline at end of file + proxy: diff --git a/docs/deploying/docker-compose.yml b/docs/deploying/docker-compose.yml index 4bcfb79a..9299a30f 100644 --- a/docs/deploying/docker-compose.yml +++ b/docs/deploying/docker-compose.yml @@ -7,8 +7,8 @@ services: ### then you are ready to go. image: girlbossceo/conduwuit:latest ### If you want to build a fresh image from the sources, then comment the image line and uncomment the - ### build lines. If you want meaningful labels in your built Conduit image, you should run docker-compose like this: - ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker-compose up -d + ### build lines. If you want meaningful labels in your built Conduit image, you should run docker compose like this: + ### CREATED=$(date -u +'%Y-%m-%dT%H:%M:%SZ') VERSION=$(grep -m1 -o '[0-9].[0-9].[0-9]' Cargo.toml) docker compose up -d # build: # context: . # args: diff --git a/docs/deploying/docker.md b/docs/deploying/docker.md index a6ba52bb..e641b995 100644 --- a/docs/deploying/docker.md +++ b/docs/deploying/docker.md @@ -91,7 +91,7 @@ Additional info about deploying Conduit can be found [here](generic.md). ### Build -To build the Conduit image with docker-compose, you first need to open and modify the `docker-compose.yml` file. There you need to comment the `image:` option and uncomment the `build:` option. Then call docker-compose with: +To build the Conduit image with docker-compose, you first need to open and modify the `docker-compose.yml` file. There you need to comment the `image:` option and uncomment the `build:` option. Then call docker compose with: ```bash docker-compose up