Compare commits
2 Commits
bb35b39ea9
...
9f587c6c5a
Author | SHA1 | Date |
---|---|---|
3wc | 9f587c6c5a | |
3wc | 3765ceaeb2 |
2
abra.sh
2
abra.sh
|
@ -1 +1 @@
|
||||||
export LOOMIO_ENTRYPOINT_VERSION=v2
|
export LOOMIO_ENTRYPOINT_VERSION=v3
|
||||||
|
|
20
compose.yml
20
compose.yml
|
@ -33,7 +33,7 @@ x-environment: &default-env
|
||||||
|
|
||||||
services:
|
services:
|
||||||
app:
|
app:
|
||||||
image: loomio/loomio:v2.11.13
|
image: loomio/loomio:v2.17.3
|
||||||
configs:
|
configs:
|
||||||
- source: entrypoint
|
- source: entrypoint
|
||||||
target: /entrypoint.sh
|
target: /entrypoint.sh
|
||||||
|
@ -64,9 +64,9 @@ services:
|
||||||
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
- "traefik.http.routers.${STACK_NAME}.rule=Host(`${DOMAIN}`${EXTRA_DOMAINS})"
|
||||||
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
- "traefik.http.routers.${STACK_NAME}.entrypoints=web-secure"
|
||||||
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
- "traefik.http.routers.${STACK_NAME}.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||||
- "coop-cloud.${STACK_NAME}.version=0.1.0+v2.7.10"
|
- "coop-cloud.${STACK_NAME}.version=0.2.0+v2.17.3"
|
||||||
worker:
|
worker:
|
||||||
image: loomio/loomio:v2.11.13
|
image: loomio/loomio:v2.17.3
|
||||||
configs:
|
configs:
|
||||||
- source: entrypoint
|
- source: entrypoint
|
||||||
target: /entrypoint.sh
|
target: /entrypoint.sh
|
||||||
|
@ -88,7 +88,7 @@ services:
|
||||||
- loomio_files:/loomio/public/files
|
- loomio_files:/loomio/public/files
|
||||||
- loomio_plugins:/loomio/plugins/docker
|
- loomio_plugins:/loomio/plugins/docker
|
||||||
db:
|
db:
|
||||||
image: postgres:12.7
|
image: postgres:12.14
|
||||||
networks:
|
networks:
|
||||||
- backend
|
- backend
|
||||||
volumes:
|
volumes:
|
||||||
|
@ -119,10 +119,16 @@ services:
|
||||||
environment:
|
environment:
|
||||||
- REDIS_URL=redis://redis:6379
|
- REDIS_URL=redis://redis:6379
|
||||||
cron:
|
cron:
|
||||||
image: loomio/loomio:v2.7.10
|
image: loomio/loomio:v2.17.3
|
||||||
entrypoint: "/usr/local/bundle/bin/bundle"
|
configs:
|
||||||
command: ["exec", "rake", "loomio:hourly_tasks"]
|
- source: entrypoint
|
||||||
|
target: /entrypoint.sh
|
||||||
|
mode: 0555
|
||||||
|
entrypoint: [ "/entrypoint.sh", "rake", "loomio:hourly_tasks" ]
|
||||||
environment: *default-env
|
environment: *default-env
|
||||||
|
secrets:
|
||||||
|
- devise_secret
|
||||||
|
- secret_cookie_token
|
||||||
volumes:
|
volumes:
|
||||||
- loomio_uploads:/loomio/public/system
|
- loomio_uploads:/loomio/public/system
|
||||||
- loomio_storage:/loomio/storage
|
- loomio_storage:/loomio/storage
|
||||||
|
|
|
@ -29,5 +29,10 @@ if test ! -f /loomio/storage/migrations_ran; then
|
||||||
rake db:setup
|
rake db:setup
|
||||||
touch /loomio/storage/migrations_ran
|
touch /loomio/storage/migrations_ran
|
||||||
fi
|
fi
|
||||||
echo "starting loomio!"
|
if [ -n "$1" ]; then
|
||||||
/loomio/docker_start.sh
|
echo "Running '$1'"
|
||||||
|
$1
|
||||||
|
else
|
||||||
|
echo "starting loomio!"
|
||||||
|
/loomio/docker_start.sh
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue