Entrypoint tweaks, fix cron container
This commit is contained in:
parent
bb35b39ea9
commit
3765ceaeb2
2
abra.sh
2
abra.sh
@ -1 +1 @@
|
|||||||
export LOOMIO_ENTRYPOINT_VERSION=v2
|
export LOOMIO_ENTRYPOINT_VERSION=v3
|
||||||
|
10
compose.yml
10
compose.yml
@ -120,9 +120,15 @@ services:
|
|||||||
- REDIS_URL=redis://redis:6379
|
- REDIS_URL=redis://redis:6379
|
||||||
cron:
|
cron:
|
||||||
image: loomio/loomio:v2.7.10
|
image: loomio/loomio:v2.7.10
|
||||||
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…
x
Reference in New Issue
Block a user