From 534fb7acd37913329bc0835685bea00ff7880bd5 Mon Sep 17 00:00:00 2001 From: knoflook Date: Tue, 8 Feb 2022 17:09:18 +0100 Subject: [PATCH] chore: publish 0.1.0+v2.11.13 release --- abra.sh | 1 + compose.yml | 34 +++++++++++++++++++++++----------- entrypoint.sh | 10 ++++++++++ 3 files changed, 34 insertions(+), 11 deletions(-) create mode 100644 abra.sh create mode 100644 entrypoint.sh diff --git a/abra.sh b/abra.sh new file mode 100644 index 0000000..c06c141 --- /dev/null +++ b/abra.sh @@ -0,0 +1 @@ +export LOOMIO_ENTRYPOINT_VERSION=v1 diff --git a/compose.yml b/compose.yml index 3ad5e7f..99f32b9 100644 --- a/compose.yml +++ b/compose.yml @@ -33,7 +33,12 @@ x-environment: &default-env services: app: - image: loomio/loomio:v2.11.11 + image: loomio/loomio:v2.11.13 + configs: + - source: entrypoint + target: /entrypoint.sh + mode: 0555 + entrypoint: /entrypoint.sh volumes: - loomio_uploads:/loomio/public/system - loomio_storage:/loomio/storage @@ -56,14 +61,16 @@ services: - "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})" - "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure" - "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}" - - "coop-cloud.${STACK_NAME}.version=" + - "coop-cloud.${STACK_NAME}.version=0.1.0+v2.11.13" worker: - image: loomio/loomio:v2.11.11 + image: loomio/loomio:v2.11.13 networks: - backend environment: !!merge <<: *default-env TASK: worker + depends_on: + - app volumes: - loomio_uploads:/loomio/public/system - loomio_storage:/loomio/storage @@ -84,14 +91,14 @@ services: image: redis:5.0 networks: - backend - #mailin: - # image: loomio/mailin-docker:latest - # networks: - # - proxy - # ports: - # - "25:25" - # environment: - # - WEBHOOK_URL=http://app:3000/email_processor/ + # mailin: + # image: loomio/mailin-docker:latest + # networks: + # - proxy + # ports: + # - "25:25" + # environment: + # - WEBHOOK_URL=http://app:3000/email_processor/ channels: image: loomio/loomio_channel_server networks: @@ -112,3 +119,8 @@ volumes: loomio_import: pgdata: pgdumps: + +configs: + entrypoint: + name: ${STACK_NAME}_entrypoint_${LOOMIO_ENTRYPOINT_VERSION} + file: entrypoint.sh diff --git a/entrypoint.sh b/entrypoint.sh new file mode 100644 index 0000000..fab19fa --- /dev/null +++ b/entrypoint.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +if test ! -f /loomio/storage/migrations_ran; then + echo "first deploy, running migrations..." + rake db:setup + touch /loomio/storage/migrations_ran +fi + +echo "starting loomio!" +/loomio/docker_start.sh