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
|
||||
cron:
|
||||
image: loomio/loomio:v2.7.10
|
||||
entrypoint: "/usr/local/bundle/bin/bundle"
|
||||
command: ["exec", "rake", "loomio:hourly_tasks"]
|
||||
configs:
|
||||
- source: entrypoint
|
||||
target: /entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: [ "/entrypoint.sh", "rake", "loomio:hourly_tasks" ]
|
||||
environment: *default-env
|
||||
secrets:
|
||||
- devise_secret
|
||||
- secret_cookie_token
|
||||
volumes:
|
||||
- loomio_uploads:/loomio/public/system
|
||||
- loomio_storage:/loomio/storage
|
||||
|
|
|
@ -29,5 +29,10 @@ if test ! -f /loomio/storage/migrations_ran; then
|
|||
rake db:setup
|
||||
touch /loomio/storage/migrations_ran
|
||||
fi
|
||||
echo "starting loomio!"
|
||||
/loomio/docker_start.sh
|
||||
if [ -n "$1" ]; then
|
||||
echo "Running '$1'"
|
||||
$1
|
||||
else
|
||||
echo "starting loomio!"
|
||||
/loomio/docker_start.sh
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue