From 139ba377d804809280016918d94582cf7146f110 Mon Sep 17 00:00:00 2001 From: Filip Rysavy <29089732+firyx@users.noreply.github.com> Date: Wed, 11 May 2022 10:04:31 +0200 Subject: [PATCH 1/6] Fix missing logs dir for backup/cron scripts --- changelog/items/bugs-fixed/fix-missing-logs-dir.md | 1 + logs/.empty-file | 2 ++ 2 files changed, 3 insertions(+) create mode 100644 changelog/items/bugs-fixed/fix-missing-logs-dir.md create mode 100644 logs/.empty-file diff --git a/changelog/items/bugs-fixed/fix-missing-logs-dir.md b/changelog/items/bugs-fixed/fix-missing-logs-dir.md new file mode 100644 index 00000000..19754e65 --- /dev/null +++ b/changelog/items/bugs-fixed/fix-missing-logs-dir.md @@ -0,0 +1 @@ +- Fix missing `logs` dir that is required for backup scripts (cron jobs). \ No newline at end of file diff --git a/logs/.empty-file b/logs/.empty-file new file mode 100644 index 00000000..336d744e --- /dev/null +++ b/logs/.empty-file @@ -0,0 +1,2 @@ +Purpose of this file is that `logs` dir can be commited to git and it will be +present on portal servers. The rest of files are git ignored. \ No newline at end of file From 2cf142ef45b2f475fac0c4818dfd645a3965ec74 Mon Sep 17 00:00:00 2001 From: Filip Rysavy <29089732+firyx@users.noreply.github.com> Date: Wed, 11 May 2022 10:06:57 +0200 Subject: [PATCH 2/6] Update comment --- logs/.empty-file | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logs/.empty-file b/logs/.empty-file index 336d744e..bd5b3ce0 100644 --- a/logs/.empty-file +++ b/logs/.empty-file @@ -1,2 +1,2 @@ Purpose of this file is that `logs` dir can be commited to git and it will be -present on portal servers. The rest of files are git ignored. \ No newline at end of file +present on portal servers. The rest of files in `logs` dir are git ignored. From 600ed72bbb0f18ca37d9fb331ed4fd9780d04b3a Mon Sep 17 00:00:00 2001 From: Filip Rysavy <29089732+firyx@users.noreply.github.com> Date: Wed, 11 May 2022 10:29:07 +0200 Subject: [PATCH 3/6] Rename logs dummy file --- logs/{.empty-file => .gitkeep} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename logs/{.empty-file => .gitkeep} (100%) diff --git a/logs/.empty-file b/logs/.gitkeep similarity index 100% rename from logs/.empty-file rename to logs/.gitkeep From 9f7b676ec34b0b288bb1f624ec1131bab8eec953 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Mon, 16 May 2022 16:30:41 +0200 Subject: [PATCH 4/6] update skynet-accounts version --- docker-compose.accounts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 99b10ff4..4221ff05 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -22,7 +22,7 @@ services: accounts: # uncomment "build" and comment out "image" to build from sources # build: https://github.com/SkynetLabs/skynet-accounts.git#main - image: skynetlabs/skynet-accounts + image: skynetlabs/skynet-accounts:1.1.0 container_name: accounts restart: unless-stopped logging: *default-logging From 1ac4c04e42701a881b7c1f6a665804b476dbd980 Mon Sep 17 00:00:00 2001 From: Karol Wypchlo Date: Tue, 17 May 2022 13:04:34 +0200 Subject: [PATCH 5/6] server domain workaround for single server portals --- docker/nginx/docker-entrypoint.sh | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/docker/nginx/docker-entrypoint.sh b/docker/nginx/docker-entrypoint.sh index d45a6d9a..3bc26ca9 100755 --- a/docker/nginx/docker-entrypoint.sh +++ b/docker/nginx/docker-entrypoint.sh @@ -36,6 +36,19 @@ else exec 3>/dev/null fi +# Really dirty backwards compatible workaround for single server portals: +# ======================================================================= +# in the past we used to require single server portals not to include +# server domain env variable because it messed up with caddy; we switched +# to certbot and that is not the case any more but we also switched to +# using built in envsubst instead of custom mustache script for nginx +# templating and now when server domain is not defined, it messes up whole +# nginx config and nginx will not start; this workaround assigns portal +# domain as a server domain if server domain is not defined +if [ -z "${SERVER_DOMAIN}" ]; then + export SERVER_DOMAIN=${PORTAL_DOMAIN} +fi + if [ "$1" = "nginx" -o "$1" = "nginx-debug" ]; then if /usr/bin/find "/docker-entrypoint.d/" -mindepth 1 -maxdepth 1 -type f -print -quit 2>/dev/null | read v; then echo >&3 "$0: /docker-entrypoint.d/ is not empty, will attempt to perform configuration" From 26df82a263b38dae8cdf50a7a0a734d2a2f471b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20Wypch=C5=82o?= Date: Tue, 17 May 2022 14:34:38 +0200 Subject: [PATCH 6/6] Do not build dashboard-v2 Do not build dashboard-v2 until we're ready to make a switch --- docker-compose.accounts.yml | 46 +++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/docker-compose.accounts.yml b/docker-compose.accounts.yml index 99b10ff4..6865545c 100644 --- a/docker-compose.accounts.yml +++ b/docker-compose.accounts.yml @@ -78,25 +78,27 @@ services: depends_on: - mongo - dashboard-v2: - build: - context: ./packages/dashboard-v2 - dockerfile: Dockerfile - container_name: dashboard-v2 - restart: unless-stopped - logging: *default-logging - env_file: - - .env - environment: - - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN} - - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} - volumes: - - ./docker/data/dashboard-v2/.cache:/usr/app/.cache - - ./docker/data/dashboard-v2/public:/usr/app/public - networks: - shared: - ipv4_address: 10.10.10.86 - expose: - - 9000 - depends_on: - - mongo + # Do not build dashboard-v2 until we're ready to make a switch + # ============================================================ + # dashboard-v2: + # build: + # context: ./packages/dashboard-v2 + # dockerfile: Dockerfile + # container_name: dashboard-v2 + # restart: unless-stopped + # logging: *default-logging + # env_file: + # - .env + # environment: + # - GATSBY_PORTAL_DOMAIN=${PORTAL_DOMAIN} + # - GATSBY_STRIPE_PUBLISHABLE_KEY=${STRIPE_PUBLISHABLE_KEY} + # volumes: + # - ./docker/data/dashboard-v2/.cache:/usr/app/.cache + # - ./docker/data/dashboard-v2/public:/usr/app/public + # networks: + # shared: + # ipv4_address: 10.10.10.86 + # expose: + # - 9000 + # depends_on: + # - mongo