From a49709992cf6f22655c1d4e308b653c2f66eaaa6 Mon Sep 17 00:00:00 2001
From: Simon Larsen <simonlarsen@oneuptime.com>
Date: Sat, 3 Aug 2024 20:07:56 -0600
Subject: [PATCH] refactor: Update docker-compose commands to use "docker
compose" instead of "docker-compose"
---
.github/workflows/test-release.yaml | 4 ++--
App/FeatureSet/Docs/Content/copilot/deploy-llm-server.md | 2 +-
App/FeatureSet/Docs/Content/installation/docker-compose.md | 2 +-
App/FeatureSet/Docs/Content/probe/custom-probe.md | 2 +-
Haraka/README.md | 2 +-
config.example.env | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/test-release.yaml b/.github/workflows/test-release.yaml
index f3e5760fa1d..cd5fa5e0b72 100644
--- a/.github/workflows/test-release.yaml
+++ b/.github/workflows/test-release.yaml
@@ -1067,7 +1067,7 @@ jobs:
- name: Wait for server to start
run: bash ./Tests/Scripts/status-check.sh http://localhost
- name: Run E2E Tests. Run docker container e2e in docker compose file
- run: export $(grep -v '^#' config.env | xargs) && docker-compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker-compose -f docker-compose.dev.yml logs e2e && exit 1)
+ run: export $(grep -v '^#' config.env | xargs) && docker compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker compose -f docker-compose.dev.yml logs e2e && exit 1)
- name: Upload test results
uses: actions/upload-artifact@v4
# Run this on failure
@@ -1120,7 +1120,7 @@ jobs:
- name: Wait for server to start
run: bash ./Tests/Scripts/status-check.sh http://localhost
- name: Run E2E Tests. Run docker container e2e in docker compose file
- run: export $(grep -v '^#' config.env | xargs) && docker-compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker-compose -f docker-compose.dev.yml logs e2e && exit 1)
+ run: export $(grep -v '^#' config.env | xargs) && docker compose -f docker-compose.dev.yml up --exit-code-from e2e --abort-on-container-exit e2e || (docker compose -f docker-compose.dev.yml logs e2e && exit 1)
- name: Upload test results
uses: actions/upload-artifact@v4
# Run this on failure
diff --git a/App/FeatureSet/Docs/Content/copilot/deploy-llm-server.md b/App/FeatureSet/Docs/Content/copilot/deploy-llm-server.md
index 9f57b118973..399275ec583 100644
--- a/App/FeatureSet/Docs/Content/copilot/deploy-llm-server.md
+++ b/App/FeatureSet/Docs/Content/copilot/deploy-llm-server.md
@@ -48,7 +48,7 @@ llm:
Run the following command to start the LLM Server:
```bash
-docker-compose up -d
+docker compose up -d
```
You can now access the LLM Server at `http://localhost:8547`.
diff --git a/App/FeatureSet/Docs/Content/installation/docker-compose.md b/App/FeatureSet/Docs/Content/installation/docker-compose.md
index f9b713daea8..00e62a73211 100644
--- a/App/FeatureSet/Docs/Content/installation/docker-compose.md
+++ b/App/FeatureSet/Docs/Content/installation/docker-compose.md
@@ -49,7 +49,7 @@ npm start
If you don't like to use npm or do not have it installed, run this instead:
```
-# Read env vars from config.env file and run docker-compose up.
+# Read env vars from config.env file and run docker compose up.
(export $(grep -v '^#' config.env | xargs) && docker compose up --remove-orphans -d)
# Use sudo if you're having permission issues with binding ports.
diff --git a/App/FeatureSet/Docs/Content/probe/custom-probe.md b/App/FeatureSet/Docs/Content/probe/custom-probe.md
index d84518a6f48..9b18a23a8d9 100644
--- a/App/FeatureSet/Docs/Content/probe/custom-probe.md
+++ b/App/FeatureSet/Docs/Content/probe/custom-probe.md
@@ -38,7 +38,7 @@ services:
Then run the following command:
```
-docker-compose up -d
+docker compose up -d
```
If you are self hosting OneUptime, you can change `ONEUPTIME_URL` to your custom self hosted instance.
diff --git a/Haraka/README.md b/Haraka/README.md
index 74dac7c831c..cf7809c73cd 100644
--- a/Haraka/README.md
+++ b/Haraka/README.md
@@ -38,7 +38,7 @@ bash generate.sh
cd ..
```
-`public` and `private` files should have been generated inside of `dkim` folder. Please also add DNS and env vars to docker-compose files. Values of that should be shown on the console.
+`public` and `private` files should have been generated inside of `dkim` folder. Please also add DNS and env vars to docker compose files. Values of that should be shown on the console.
diff --git a/config.example.env b/config.example.env
index 3f2e65b6022..0d9e9aca073 100644
--- a/config.example.env
+++ b/config.example.env
@@ -53,7 +53,7 @@ ENVIRONMENT=production
# What image should we pull from docker hub. This only applies when the ENVIRONMENT is production or test
APP_TAG=release
-# What is the name of the docker-compose project. This is used to prefix the docker containers.
+# What is the name of the docker compose project. This is used to prefix the docker containers.
COMPOSE_PROJECT_NAME=oneuptime
# OTEL HOST - if you like the collector to be hosted on a different server then change this to the IP of the server.