diff --git a/app/gitea/docker-compose.yml b/app/gitea/docker-compose.yml index fc0ca02..ce8a9a7 100644 --- a/app/gitea/docker-compose.yml +++ b/app/gitea/docker-compose.yml @@ -1,14 +1,12 @@ -version: "3" - services: server: - image: gitea/gitea:1.22.4 + image: gitea/gitea:1.22.6 + restart: unless-stopped environment: - "USER_UID=${USER_UID}" - "USER_GID=${USER_GID}" - "GITEA__server__SSH_PORT=2222" - restart: unless-stopped volumes: - ./data:/data - /etc/timezone:/etc/timezone:ro diff --git a/app/keycloak/docker-compose.prod.yml b/app/keycloak/docker-compose.prod.yml index 6d32b59..edae914 100644 --- a/app/keycloak/docker-compose.prod.yml +++ b/app/keycloak/docker-compose.prod.yml @@ -1,5 +1,3 @@ -version: "3" - # Images: https://quay.io/repository/keycloak/keycloak?tab=tags&tag=latest # Configuration: https://www.keycloak.org/server/all-config diff --git a/app/keycloak/docker-compose.yml b/app/keycloak/docker-compose.yml index 47ed88a..02761cd 100644 --- a/app/keycloak/docker-compose.yml +++ b/app/keycloak/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3" - # Images: https://quay.io/repository/keycloak/keycloak?tab=tags&tag=latest # Configuration: https://www.keycloak.org/server/all-config diff --git a/app/outline/docker-compose.prod.yml b/app/outline/docker-compose.prod.yml index 0742da6..1f73d55 100644 --- a/app/outline/docker-compose.prod.yml +++ b/app/outline/docker-compose.prod.yml @@ -1,8 +1,8 @@ -version: "3.2" services: outline-app: image: outlinewiki/outline:0.81.1 + restart: unless-stopped ports: - "${WEB_SERVER_PORT}:3000" depends_on: @@ -37,6 +37,7 @@ services: redis: image: redis:7.2-bookworm + restart: unless-stopped ports: - "6379:6379" volumes: @@ -45,6 +46,7 @@ services: postgres: image: postgres:16.3-bookworm + restart: unless-stopped ports: - "5432:5432" volumes: diff --git a/app/wiki/docker-compose.yml b/app/wiki/docker-compose.yml deleted file mode 100644 index 1b7781c..0000000 --- a/app/wiki/docker-compose.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.300 - 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/tasks.py b/tasks.py index f79d6c2..d9e1e1e 100644 --- a/tasks.py +++ b/tasks.py @@ -3,7 +3,7 @@ import shlex import fabric from invoke import task -SERVER_HOST_FILE = "ansible/hosts_prod" +SERVER_HOST_FILE = "hosts_prod" DOKER_REGISTRY = "cr.yandex/crplfk0168i4o8kd7ade" @@ -12,11 +12,6 @@ def deploy_gitea(context): deploy("gitea", dirs=["data"]) -@task(name="deploy:wiki") -def deploy_wiki(context): - deploy("wiki") - - @task(name="deploy:keycloak") def deploy_keykloak(context): deploy("keycloak", compose_file="docker-compose.prod.yml", dirs=["data"]) @@ -56,7 +51,7 @@ def deploy(app_name: str, compose_file="docker-compose.yml", dirs=None): c.run(f"mkdir -p {d}") print("Up services") c.run( - f"docker-compose --project-name {shlex.quote(app_name)} --env-file=.env.prod up --detach --remove-orphans" + f"docker compose --project-name {shlex.quote(app_name)} --env-file=.env.prod up --detach --remove-orphans" ) c.run( f"docker system prune --all --volumes --force"