diff --git a/Taskfile.yml b/Taskfile.yml new file mode 100644 index 0000000..cbbceb7 --- /dev/null +++ b/Taskfile.yml @@ -0,0 +1,14 @@ +# https://taskfile.dev + +version: '3' + +vars: + USER_ID: + sh: id -u + GROUP_ID: + sh: id -g + +tasks: + format-py-files: + cmds: + - docker run --rm -u {{.USER_ID}}:{{.GROUP_ID}} -v $PWD/app:/app -w /app pyfound/black:latest_release black . diff --git a/app/gitea/tasks.py b/app/gitea/tasks.py index bcc7393..b2ffcda 100644 --- a/app/gitea/tasks.py +++ b/app/gitea/tasks.py @@ -4,7 +4,6 @@ import shlex APP_NAME = "gitea" SSH_HOST = f"{APP_NAME}@158.160.115.150" -DOCKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade" @task @@ -17,4 +16,6 @@ def deploy(c): ) c.run("cp .env .env.prod") c.run("mkdir -p data") - c.run(f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans") + c.run( + f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans" + ) diff --git a/app/wiki/docker-compose.prod.yml b/app/wiki/docker-compose.prod.yml deleted file mode 100644 index d7142b2..0000000 --- a/app/wiki/docker-compose.prod.yml +++ /dev/null @@ -1,33 +0,0 @@ -version: "3" - -services: - - db: - image: postgres:15.2-alpine - environment: - POSTGRES_DB: wiki - POSTGRES_PASSWORD: wikijsrocks - POSTGRES_USER: wikijs - logging: - driver: "none" - restart: unless-stopped - volumes: - - db-data:/var/lib/postgresql/data - - wiki: - image: ghcr.io/requarks/wiki:2.5.299 - depends_on: - - db - environment: - DB_TYPE: postgres - DB_HOST: db - DB_PORT: 5432 - DB_USER: wikijs - DB_PASS: wikijsrocks - DB_NAME: wiki - restart: unless-stopped - ports: - - "${WEB_SERVER_PORT}:3000" - -volumes: - db-data: diff --git a/app/wiki/docker-compose.yml b/app/wiki/docker-compose.yml index 5ae8472..1b7781c 100644 --- a/app/wiki/docker-compose.yml +++ b/app/wiki/docker-compose.yml @@ -15,7 +15,7 @@ services: - db-data:/var/lib/postgresql/data wiki: - image: ghcr.io/requarks/wiki:2.5.299 + image: ghcr.io/requarks/wiki:2.5.300 depends_on: - db environment: @@ -27,7 +27,7 @@ services: DB_NAME: wiki restart: unless-stopped ports: - - "9080:3000" + - "${WEB_SERVER_PORT}:3000" volumes: db-data: diff --git a/app/wiki/tasks.py b/app/wiki/tasks.py index 1a62701..16127a7 100644 --- a/app/wiki/tasks.py +++ b/app/wiki/tasks.py @@ -17,8 +17,10 @@ def deploy(c): print("Ready to setup remote host") with Connection(SSH_HOST) as c: c.put( - "docker-compose.prod.yml", + "docker-compose.yml", remote=f"/home/{APP_NAME}/docker-compose.yml", ) c.run("cp .env .env.prod") - c.run(f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans") + c.run( + f"docker-compose --project-name {shlex.quote(APP_NAME)} --env-file=.env.prod up --detach --remove-orphans" + )