Compare commits
1 Commits
update-120
...
update-121
| Author | SHA1 | Date | |
|---|---|---|---|
| 00d71c3fb6 |
35
compose.yml
35
compose.yml
@ -3,7 +3,7 @@ version: "3.8"
|
||||
|
||||
services:
|
||||
app:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1
|
||||
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rake db:migrate; bundle exec rails s -p 3000"
|
||||
networks: &bothNetworks
|
||||
- proxy
|
||||
@ -19,9 +19,12 @@ services:
|
||||
- "traefik.http.routers.${STACK_NAME}_web.rule=Host(`${DOMAIN}`)"
|
||||
- "traefik.http.routers.${STACK_NAME}_web.entrypoints=web-secure"
|
||||
- "traefik.http.routers.${STACK_NAME}_web.tls.certresolver=${LETS_ENCRYPT_ENV}"
|
||||
- "coop-cloud.${STACK_NAME}.version=3.0.0+v4.5.6-hometown-1.2.0"
|
||||
- "coop-cloud.${STACK_NAME}.version=3.0.1+v4.5.11-hometown-1.2.1"
|
||||
configs: &configs
|
||||
- source: entrypoint_sh
|
||||
- source: entrypoint_common_sh
|
||||
target: /usr/local/bin/entrypoint.common.sh
|
||||
mode: 0555
|
||||
- source: entrypoint_main_sh
|
||||
target: /usr/local/bin/entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: &entrypoint /usr/local/bin/entrypoint.sh
|
||||
@ -147,9 +150,15 @@ services:
|
||||
- WEB_DOMAIN
|
||||
|
||||
streaming:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0-streaming
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1-streaming
|
||||
command: node ./streaming
|
||||
configs: *configs
|
||||
configs:
|
||||
- source: entrypoint_common_sh
|
||||
target: /usr/local/bin/entrypoint.common.sh
|
||||
mode: 0555
|
||||
- source: entrypoint_streaming_sh
|
||||
target: /usr/local/bin/entrypoint.sh
|
||||
mode: 0555
|
||||
entrypoint: *entrypoint
|
||||
secrets: *secrets
|
||||
networks: *bothNetworks
|
||||
@ -168,7 +177,7 @@ services:
|
||||
volumes: *appVolume # used to make sure this volume is created
|
||||
|
||||
sidekiq:
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.6-hometown-1.2.0
|
||||
image: git.coopcloud.tech/coop-cloud-chaos-patchs/hometown:v4.5.11-hometown-1.2.1
|
||||
secrets: *secrets
|
||||
command: bundle exec sidekiq
|
||||
configs: *configs
|
||||
@ -248,7 +257,15 @@ networks:
|
||||
internal: true
|
||||
|
||||
configs:
|
||||
entrypoint_sh:
|
||||
name: ${STACK_NAME}_entrypoint_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.sh.tmpl
|
||||
entrypoint_common_sh:
|
||||
name: ${STACK_NAME}_ep_common_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.common.sh.tmpl
|
||||
template_driver: golang
|
||||
entrypoint_main_sh:
|
||||
name: ${STACK_NAME}_ep_main_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.main.sh.tmpl
|
||||
template_driver: golang
|
||||
entrypoint_streaming_sh:
|
||||
name: ${STACK_NAME}_ep_streaming_conf_${ENTRYPOINT_CONF_VERSION}
|
||||
file: entrypoint.streaming.sh.tmpl
|
||||
template_driver: golang
|
||||
|
||||
@ -38,4 +38,3 @@ file_env "ACTIVE_RECORD_ENCRYPTION_PRIMARY_KEY"
|
||||
file_env "OIDC_CLIENT_SECRET"
|
||||
{{ end }}
|
||||
|
||||
/usr/bin/tini -s -- "$@"
|
||||
6
entrypoint.main.sh.tmpl
Normal file
6
entrypoint.main.sh.tmpl
Normal file
@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
source entrypoint.common.sh
|
||||
|
||||
/usr/bin/tini -s -- "$@"
|
||||
|
||||
6
entrypoint.streaming.sh.tmpl
Normal file
6
entrypoint.streaming.sh.tmpl
Normal file
@ -0,0 +1,6 @@
|
||||
#!/bin/bash
|
||||
|
||||
source entrypoint.common.sh
|
||||
|
||||
node ./streaming/index.js
|
||||
|
||||
1
release/3.0.1+v4.5.11-hometown-1.2.1
Normal file
1
release/3.0.1+v4.5.11-hometown-1.2.1
Normal file
@ -0,0 +1 @@
|
||||
No migration necessary, but backing up the database is recommended.
|
||||
Reference in New Issue
Block a user