From 8a3258e522492359818152ce3acb54f10705648e Mon Sep 17 00:00:00 2001 From: Sebastian Stehle Date: Mon, 26 Aug 2024 15:38:00 +0200 Subject: [PATCH] Fix docker compose. --- .github/workflows/dev.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- README.md | 2 +- deployment/docker-compose/README.md | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index dff04956..9aed365b 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -44,7 +44,7 @@ jobs: GOOGLE__KEYFILE: ${{ secrets.GOOGLE__KEYFILE }} - name: Test - Start Compose - run: docker-compose up -d + run: docker compose up -d working-directory: tools/TestSuite - name: Test - RUN @@ -87,7 +87,7 @@ jobs: - name: Test - Cleanup if: always() - run: docker-compose down + run: docker compose down working-directory: tools/TestSuite - name: Publish - Calculate Version diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c39468cb..ce889115 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,7 +38,7 @@ jobs: GOOGLE__KEYFILE: ${{ secrets.GOOGLE__KEYFILE }} - name: Test - Start Compose - run: docker-compose up -d + run: docker compose up -d working-directory: tools/TestSuite - name: Test - RUN @@ -80,7 +80,7 @@ jobs: - name: Test - Cleanup if: always() - run: docker-compose down + run: docker compose down working-directory: tools/TestSuite - name: Publish - Get Major Version diff --git a/README.md b/README.md index 1f3639c6..43ba3a1a 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ Before you install it, try it out at https://app.notifo.io ### Install it using the docker image -docker images are available: https://hub.docker.com/r/squidex/notifo, you can try the [docker-compose](deployment/docker-compose/docker-compose.yml) file. +docker images are available: https://hub.docker.com/r/squidex/notifo, you can try the [docker compose](deployment/docker compose/docker compose.yml) file. Read more about the installation in the [wiki](https://github.com/notifo-io/notifo/wiki/Installation). diff --git a/deployment/docker-compose/README.md b/deployment/docker-compose/README.md index e037c944..0f37821b 100644 --- a/deployment/docker-compose/README.md +++ b/deployment/docker-compose/README.md @@ -8,7 +8,7 @@ Notifo needs https. This is a little bit tricky on localhost. Caddy is used as a reverse proxy and also creates the certificates. Usually lets-encrypt is used for that, but for localhost we need to switch to a local certificate authority. -Therefore you have to comment out the following line in `docker-compose.yml`: +Therefore you have to comment out the following line in `docker compose.yml`: ```yml # - SITE_SETTINGS="tls internal" @@ -18,6 +18,6 @@ Therefore you have to comment out the following line in `docker-compose.yml`: Caddy usually installs the root certificate, but this is not available on docker. Therefore we have to install the root certificate manually. First download the certificate from the docker container: -docker cp docker-compose-notifo_proxy-1:/data/caddy/pki/authorities/local/root.crt . +docker cp docker compose-notifo_proxy-1:/data/caddy/pki/authorities/local/root.crt . Next install the certificate to the **trusted root authorities store**. You might need to restart chrome after that. \ No newline at end of file