Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Docker config with timestamp, rollback posibility #267

Merged
merged 1 commit into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions composefiles/support/swarm-monitoring.yml
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ services:
- source: set_env_secrets
target: /set_env_secrets.sh
mode: 0777
- source: frinx-telegraf-config
- source: frinx_telegraf_config
target: /etc/telegraf/telegraf.conf
mode: 0755
healthcheck:
Expand Down Expand Up @@ -235,7 +235,8 @@ secrets:
external: true

configs:
frinx-telegraf-config:
frinx_telegraf_config:
name: frinx_telegraf_config-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/monitoring/telegraf/telegraf.conf
set_env_secrets:
file: ${UF_CONFIG_PATH}/set_env_secrets.sh
Expand Down
8 changes: 6 additions & 2 deletions composefiles/swarm-uniconfig.yml
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,20 @@ services:
memory: ${UP_RES_LIMIT_MEM}

configs:
traefik_dynamic_conf:
name: traefik_dynamic_conf-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/traefik/traefik_dynamic.yml
uniconfig_startup:
name: uniconfig_startup-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/uniconfig/run_uniconfig.sh
uniconfig_lighty:
name: uniconfig_lighty-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/uniconfig/frinx/uniconfig/config/lighty-uniconfig-config.json
uniconfig_logback:
name: uniconfig_logback-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/uniconfig/frinx/uniconfig/config/logback.xml
set_env_secrets:
file: ${UF_CONFIG_PATH}/set_env_secrets.sh
traefik_dynamic_conf:
file: ${UF_CONFIG_PATH}/traefik/traefik_dynamic.yml

secrets:
frinx_uniconfig_tls_cert.pem:
Expand Down
2 changes: 2 additions & 0 deletions composefiles/swarm-unistore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,10 @@ volumes:

configs:
unistore_startup:
name: unistore_startup-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/uniconfig/run_uniconfig.sh
unistore_lighty:
name: unistore_lighty-${DEPLOY_SETTINGS_TIMESTAMP}.yml
file: ${UF_CONFIG_PATH}/unistore/lighty-unistore-config.json
set_env_secrets:
file: ${UF_CONFIG_PATH}/set_env_secrets.sh
Expand Down
1 change: 1 addition & 0 deletions startup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -560,6 +560,7 @@ startupType="full"
nodeID=$(docker node ls --filter role=manager --format {{.Hostname}})
export UC_CONFIG_PATH="${FM_DIR}/config/uniconfig/frinx/uniconfig"
export UF_CONFIG_PATH="${FM_DIR}/config"
export DEPLOY_SETTINGS_TIMESTAMP=$(date +%s)

# =======================================
# FM starting
Expand Down