From 1880d64235769926ea9e494a0ae36fd61fb9bcb6 Mon Sep 17 00:00:00 2001 From: Dessalines Date: Tue, 14 Dec 2021 08:24:33 -0500 Subject: [PATCH] Upgrading pictrs. (#1996) --- ansible/VERSION | 1 - ansible/templates/docker-compose.yml | 53 ---------------------------- docker/dev/docker-compose.yml | 2 +- docker/federation/docker-compose.yml | 2 +- docker/pleroma/docker-compose.yml | 2 +- docker/prod/docker-compose.yml | 2 +- 6 files changed, 4 insertions(+), 58 deletions(-) delete mode 100644 ansible/VERSION delete mode 100644 ansible/templates/docker-compose.yml diff --git a/ansible/VERSION b/ansible/VERSION deleted file mode 100644 index 288adf53..00000000 --- a/ansible/VERSION +++ /dev/null @@ -1 +0,0 @@ -0.13.3 diff --git a/ansible/templates/docker-compose.yml b/ansible/templates/docker-compose.yml deleted file mode 100644 index 0cf89a2b..00000000 --- a/ansible/templates/docker-compose.yml +++ /dev/null @@ -1,53 +0,0 @@ -version: '2.2' - -services: - lemmy: - image: {{ lemmy_docker_image }} - ports: - - "127.0.0.1:8536:8536" - restart: always - environment: - - RUST_LOG="warn,lemmy_server=info,lemmy_api=info,lemmy_api_common=info,lemmy_api_crud=info,lemmy_apub=info,lemmy_db_schema=info,lemmy_db_views=info,lemmy_db_views_actor=info,lemmy_db_views_moderator=info,lemmy_routes=info,lemmy_utils=info,lemmy_websocket=info" - volumes: - - ./lemmy.hjson:/config/config.hjson:ro - depends_on: - - postgres - - pictrs - - lemmy-ui: - image: {{ lemmy_docker_ui_image }} - ports: - - "127.0.0.1:1235:1234" - restart: always - environment: - - LEMMY_INTERNAL_HOST=lemmy:8536 - - LEMMY_EXTERNAL_HOST={{ domain }} - - LEMMY_HTTPS=true - depends_on: - - lemmy - - postgres: - image: postgres:12-alpine - environment: - - POSTGRES_USER=lemmy - - POSTGRES_PASSWORD={{ postgres_password }} - - POSTGRES_DB=lemmy - volumes: - - ./volumes/postgres:/var/lib/postgresql/data - restart: always - - pictrs: - image: asonix/pictrs:v0.2.6-r2 - user: 991:991 - ports: - - "127.0.0.1:8537:8080" - volumes: - - ./volumes/pictrs:/mnt - restart: always - mem_limit: 200m - - postfix: - image: mwader/postfix-relay - environment: - - POSTFIX_myhostname={{ domain }} - restart: "always" diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml index 17fb3201..ca88ac38 100644 --- a/docker/dev/docker-compose.yml +++ b/docker/dev/docker-compose.yml @@ -49,7 +49,7 @@ services: restart: always pictrs: - image: asonix/pictrs:v0.2.6-r2 + image: asonix/pictrs:0.3.0-beta.11 user: 991:991 volumes: - ./volumes/pictrs:/mnt diff --git a/docker/federation/docker-compose.yml b/docker/federation/docker-compose.yml index b33df805..9c1cd70b 100644 --- a/docker/federation/docker-compose.yml +++ b/docker/federation/docker-compose.yml @@ -22,7 +22,7 @@ services: pictrs: restart: always - image: asonix/pictrs:v0.2.6-r2 + image: asonix/pictrs:0.3.0-beta.11 user: 991:991 volumes: - ./volumes/pictrs_alpha:/mnt diff --git a/docker/pleroma/docker-compose.yml b/docker/pleroma/docker-compose.yml index 9db35700..a3edb8ae 100644 --- a/docker/pleroma/docker-compose.yml +++ b/docker/pleroma/docker-compose.yml @@ -14,7 +14,7 @@ services: pictrs: restart: always - image: asonix/pictrs:v0.2.6-r2 + image: asonix/pictrs:0.3.0-beta.11 user: 991:991 volumes: - ./volumes/pictrs:/mnt diff --git a/docker/prod/docker-compose.yml b/docker/prod/docker-compose.yml index 0c5969b8..446afb03 100644 --- a/docker/prod/docker-compose.yml +++ b/docker/prod/docker-compose.yml @@ -37,7 +37,7 @@ services: - lemmy pictrs: - image: asonix/pictrs:v0.2.6-r2 + image: asonix/pictrs:0.3.0-beta.11 ports: - "127.0.0.1:8537:8080" user: 991:991 -- 2.44.1