diff --git a/.github/workflows/run-test.yml b/.github/workflows/run-test.yml index d28b487..301ec19 100644 --- a/.github/workflows/run-test.yml +++ b/.github/workflows/run-test.yml @@ -19,8 +19,8 @@ jobs: run: yarn --check-files --frozen-lockfile --non-interactive - name: "run-test" run: | - docker-compose build - docker-compose up -d + docker composel build + docker composel up -d until curl -f http://localhost:8000/api/ping/ do echo "not success" @@ -67,7 +67,7 @@ jobs: - name: Run test shell: bash run: | - docker-compose -f docker-compose-test.yml up --exit-code-from backend + docker composel -f compose-test.yaml up --exit-code-from backend - name: "save coverage" uses: "actions/upload-artifact@v2" with: diff --git a/README.md b/README.md index bcb4cd3..21aea2d 100644 --- a/README.md +++ b/README.md @@ -28,9 +28,9 @@ There are two ways to start using Recotem. Both requires [latest docker](https:/ 1. Download "Docker resources to try out" from Assets 1. Unzip it and - (Windows) Click "recotem-compose" script - - (Linux & MacOS) Run `docker-compose` there. + - (Linux & MacOS) Run `docker composel` there. ```sh - docker-compose up` + docker composel up` ``` See [https://recotem.org/guide/installation.html]([https://recotem.org/guide/installation.html]) for a friendlier introduction. @@ -40,18 +40,18 @@ See [https://recotem.org/guide/installation.html]([https://recotem.org/guide/ins 1. Clone this repository. 2. In the repository top directory, simply run ```sh - docker-compose up + docker composel up ``` ## Development ### Backend & Worker -To run the backend (and worker) in Django development mode, use `docker-compose-dev.yml`. +To run the backend (and worker) in Django development mode, use `compose-dev.yaml`. ``` -docker-compose -f docker-compose-dev.yml build -docker-compose -f docker-compose-dev.yml up +docker composel -f compose-dev.yaml build +docker composel -f compose-dev.yaml up ``` ### frontend diff --git a/docker-compose-dev.yml b/compose-dev.yaml similarity index 100% rename from docker-compose-dev.yml rename to compose-dev.yaml diff --git a/docker-compose-test.yml b/compose-test.yaml similarity index 100% rename from docker-compose-test.yml rename to compose-test.yaml diff --git a/docker-compose.yml b/compose.yaml similarity index 100% rename from docker-compose.yml rename to compose.yaml diff --git a/release.py b/release.py index 233e2c3..460d1ad 100644 --- a/release.py +++ b/release.py @@ -9,7 +9,7 @@ VERSION = re.split(r"\/", os.environ["GITHUB_REF"])[-1] WORKDIR = Path(__file__).resolve().parent dc_content = yaml.load( - (WORKDIR / "docker-compose.yml").open(), Loader=yaml.SafeLoader + (WORKDIR / "compose.yaml").open(), Loader=yaml.SafeLoader ) dc_content["services"]["backend"].pop("build") dc_content["services"]["backend"][ @@ -31,17 +31,17 @@ @echo off cd /d %~dp0 @echo off -WHERE docker-compose.exe +WHERE docker.exe @echo off IF %ERRORLEVEL% NEQ 0 ( - echo msgbox "Could not find docker-compose.exe. Please install it from docker official page.",vbCritical,"Recotem Error" > %TEMP%/msgboxtest.vbs & %TEMP%/msgboxtest.vbs + echo msgbox "Could not find docker.exe. Please install it from docker official page.",vbCritical,"Recotem Error" > %TEMP%/msgboxtest.vbs & %TEMP%/msgboxtest.vbs EXIT /B ) -docker-compose.exe up +docker.exe compose up """ with ZipFile(f"recotem-compose-{VERSION}.zip", mode="w") as zf: - with zf.open("recotem-compose/docker-compose.yml", "w") as dcy_ofs: + with zf.open("recotem-compose/compose.yaml", "w") as dcy_ofs: dcy_ofs.write(yaml.dump(dc_content).encode()) with zf.open("recotem-compose/nginx.conf", "w") as nc_ofs: nc_ofs.write(nginx_conf_str.encode())