Skip to content

Commit

Permalink
replace with docker compose
Browse files Browse the repository at this point in the history
  • Loading branch information
marevol committed Dec 5, 2024
1 parent 383ccdd commit 4718b11
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/run-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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:
Expand Down
12 changes: 6 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
10 changes: 5 additions & 5 deletions release.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"][
Expand All @@ -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())
Expand Down

0 comments on commit 4718b11

Please sign in to comment.