feat(cloud): update all alwatr services on the cloud (#1135)

Alwatr · May 8, 2023 · f4da98d · f4da98d
2 parents 896e64b + bec87dc
commit f4da98d
Show file tree

Hide file tree

Showing 22 changed files with 116 additions and 154 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,3 @@
-cloud/classic/lib/*  filter=crypt diff=crypt merge=crypt
-*.env  filter=crypt diff=crypt merge=crypt
-uniquely/com-api/demo-user.http  filter=crypt diff=crypt merge=crypt
+cloud/classic/lib/* filter=crypt diff=crypt merge=crypt
+cloud/lib/* filter=crypt diff=crypt merge=crypt
+*.env filter=crypt diff=crypt merge=crypt
diff --git a/cloud/classic/flight-finder/compose.yml → cloud/alwatr/flight-finder/compose.yml b/cloud/classic/flight-finder/compose.yml → cloud/alwatr/flight-finder/compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   storage-server:
-    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION:-next}
+    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION}
 
     cpu_shares: 512
     mem_limit: 256m
@@ -39,7 +39,7 @@ services:
         max-file: '2'
 
   telegram-notifier:
-    image: ghcr.io/alimd/telegram-notifier:${TELEGRAM_NOTIFIER_VERSION:-next}
+    image: ghcr.io/alimd/telegram-notifier:${TELEGRAM_NOTIFIER_VERSION}
 
     cpu_shares: 512
     mem_limit: 256m
@@ -72,7 +72,7 @@ services:
         max-file: '2'
 
   flight-crawler:
-    image: ghcr.io/alimd/flight-crawler:${FLIGHT_CRAWLER_VERSION:-next}
+    image: ghcr.io/alimd/flight-crawler:${FLIGHT_CRAWLER_VERSION}
 
     cpu_shares: 256
     mem_limit: 256m
@@ -103,7 +103,7 @@ services:
         max-file: '2'
 
   api:
-    image: ghcr.io/alimd/flight-finder-api:${API_VERSION:-next}
+    image: ghcr.io/alimd/flight-finder-api:${API_VERSION}
 
     cpu_shares: 512
     mem_limit: 256m
@@ -139,7 +139,7 @@ services:
       traefik.frontend.redirect.entryPoint: https
 
   pwa:
-    image: ghcr.io/alimd/flight-finder-pwa:${PWA_VERSION:-next}
+    image: ghcr.io/alimd/flight-finder-pwa:${PWA_VERSION}
 
     cpu_shares: 512
     mem_limit: 256m
@@ -161,4 +161,3 @@ services:
       traefik.frontend.rule: Host:${PWA_DOMAIN}
       traefik.frontend.entryPoints: http, https
       traefik.frontend.redirect.entryPoint: https
-      # traefik.frontend.auth.basic.users: $PWA_AUTH
diff --git a/cloud/alwatr/flight-finder/deploy.sh b/cloud/alwatr/flight-finder/deploy.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ../../classic/lib/deploy.sh
diff --git a/cloud/alwatr/flight-finder/env/example.env b/cloud/alwatr/flight-finder/env/example.env
@@ -0,0 +1,17 @@
+U2FsdGVkX18U4oRHL1ONJCl5THpWhcLTq8ipGjqV1UxC4+mSnZrsaOd6HwN7kf0R
+lSvaQ18Y30cua/66hlMQppU+MenssxOC77vneSxcp+5aZV/F97DGiz29NqBRaMhj
+yLLG3PxFgp+8bgQkiCkd2ZXs/p5GX9xOXYgzbyybaOsCyFeX41DN1bp8ysJPTkDq
+gtpfaenQXRuLsoJhZjiKAfMGNpANFWvkVZpz9VjAl3IvOjaY6PqKZhuunL6VbWBE
+zEtfjvCDbMBWSsLXOC9ysJHmjpCkjiP+AxZ4sWjZGloEhsPSrBtikX+fKOuaYXoQ
+v9u26LA9Bq7P+4OGVprlc4HNScpaFALFfWspLbN+6DYkC5ZWO6neA3wRIlYtahTu
+qXqOyw1M6Al95+3m9jSrCW07lMZliXXy36WnX5bXFs9nD4ry7JKbgLVSihpcwaFO
+dCfvfKgphiw+tcNslWJyvjRM2ssCEIeJ8N4QXrSBWNTYATcJDTc71iNtDIr9wlFc
+rSONQu6s3PRm/5RXySr7e5NCqXoke80Q+VJLZJvRtSJ9luBdk+zQQbWreq1rFITn
+5t5OjG/vOoo77+qtxeGJ3xKG7ivEgcH00u5V6fqXznKYhz8pcCFFSaP814wW5HXd
+TLTcLN6Fqz/H7ZBBK5a3s1eoRUwKbaqfH2qbzmNJTghx0K5GP+VrA11uIl6XdE/P
+HUUwevZeNGxMcTvjSH7INvMqg8+MsBXpGYSVHANMFtNdlRnM3xkZvl9FKvbL6bon
+rrRXPzGDlqfioVWGB7prWdNd+nKXNBjFK0LPWUfTOmBFOpDtgilLfKZk0Fuf+E+e
+pKDlM836lqNxhj1DMfAWVoHlijk7TsDilfImgBxB6tfXtqtDFfeWu8p3+mnnAhcE
+21ZFhtEH9In8nydSVHgKeKXEpMXmszbhllrHOkENQhuwwwHitvnN52c0MIw5GjHH
+H7EL4v1gIwKeZ3Mr+QuZf28OjBJlcCf3PBRQNigMr25c6XerEcXIO4RrgXPiNwzH
+fZRcqM2ivkFi4nlKNLHkm/O/qh4YEscV+t26iiO2Tcg=
diff --git a/cloud/classic/com-pwa/compose.yml → cloud/alwatr/soffit-order/compose.yml b/cloud/classic/com-pwa/compose.yml → cloud/alwatr/soffit-order/compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   pwa:
-    image: ghcr.io/alimd/com-pwa:${COM_PWA_VERSION:-next}
+    image: ghcr.io/alimd/com-pwa:${PWA_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -24,7 +24,7 @@ services:
         max-file: '2'
 
     environment:
-      - DOMAIN=${DOMAIN}
+      - NGINX_ACCESS_LOG=${PWA_ACCESS_LOG:-off}
 
     labels:
       traefik.enable: true
@@ -34,7 +34,7 @@ services:
       traefik.frontend.redirect.entryPoint: https
 
   api:
-    image: ghcr.io/alimd/com-api:${COM_API_VERSION:-next}
+    image: ghcr.io/alimd/com-api:${API_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -61,8 +61,8 @@ services:
       - STORAGE_HOST=${APP_ID}-storage-server
       - STORAGE_PORT=80
       - STORAGE_TOKEN=${STORAGE_ACCESS_TOKEN}
-      - ADMIN_TOKEN=${COM_API_ADMIN_TOKEN}
-      - ALWATR_DEBUG=${COM_API_DEBUG:-}
+      - ADMIN_TOKEN=${API_ADMIN_TOKEN}
+      - ALWATR_DEBUG=${API_DEBUG:-}
 
     logging:
       driver: json-file
@@ -77,44 +77,8 @@ services:
       traefik.frontend.entryPoints: http, https
       traefik.frontend.redirect.entryPoint: https
 
-  comment:
-    image: ghcr.io/alimd/comment:${COMMENT_API_VERSION:-next}
-
-    cpu_count: 1
-    cpu_shares: 1024
-    mem_limit: 256m
-
-    restart: unless-stopped
-
-    networks:
-      internal:
-      alwatr-public-network:
-
-    depends_on:
-      - storage-server
-
-    environment:
-      - STORAGE_HOST=${APP_ID}-storage-server
-      - STORAGE_PORT=80
-      - STORAGE_TOKEN=${STORAGE_ACCESS_TOKEN}
-      - ACCESS_TOKEN=${COMMENT_API_ACCESS_TOKEN}
-      - ALWATR_DEBUG=${COMMENT_DEBUG:-}
-
-    logging:
-      driver: json-file
-      options:
-        max-size: '10m'
-        max-file: '2'
-
-    labels:
-      traefik.enable: true
-      traefik.port: 80
-      traefik.frontend.rule: Host:${DOMAIN}; PathPrefix:/api/v0/comment/
-      traefik.frontend.entryPoints: http, https
-      traefik.frontend.redirect.entryPoint: https
-
   storage-server:
-    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION:-next}
+    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -148,7 +112,7 @@ services:
         max-file: '2'
 
   nginx-storage:
-    image: ghcr.io/alimd/nginx-storage:${NGINX_STORAGE_VERSION:-1}
+    image: ghcr.io/alimd/nginx-storage:${NGINX_STORAGE_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -160,7 +124,7 @@ services:
       alwatr-public-network:
 
     environment:
-      - NGINX_ACCESS_LOG=${NGINX_ACCESS_LOG:-}
+      - NGINX_ACCESS_LOG=${NGINX_STORAGE_ACCESS_LOG:-off}
 
     volumes:
       - type: bind
@@ -183,7 +147,7 @@ services:
       traefik.frontend.redirect.entryPoint: https
 
   cdn:
-    image: ghcr.io/alimd/nginx:${CDN_VERSION:-1}
+    image: ghcr.io/alimd/nginx:${CDN_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -195,7 +159,7 @@ services:
       alwatr-public-network:
 
     environment:
-      - NGINX_ACCESS_LOG=${NGINX_ACCESS_LOG:-}
+      - NGINX_ACCESS_LOG=${CDN_ACCESS_LOG:-off}
 
     volumes:
       - type: bind

diff --git a/cloud/alwatr/soffit-order/deploy.sh b/cloud/alwatr/soffit-order/deploy.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ../../classic/lib/deploy.sh
diff --git a/cloud/alwatr/soffit-order/env/soffit-order-beta.env b/cloud/alwatr/soffit-order/env/soffit-order-beta.env
@@ -0,0 +1,14 @@
+U2FsdGVkX1/oopcWp9Kb5yZclEA0pokHVgRj99jRcClkWzQMexqXpRUesMc4JoCQ
+98oXVAJ40/7kygOS++8nZ0S6ng22tQv+6sUPQETNjoDG9LmJhbMQIfPU0ZJZLyD7
+7Glav+NdRfR4Dh5yqrCkLQwPIGyB0EUX2GBJYu6gWIAeDHEztWf1jB0hhj5PpCUT
+0sh/FkEly9FQfZgo70O5vou6Px9E9dp861De+ae++mccOCoSRyfR3U8VLOle0yb+
+fhy4hxtCqcmTteMHCydk5wJ9mF+Xrx0l/rKfvIJn3Ac17RNlCkJ7HgeOhGubaGni
+aesomWHB0gJqlIlRvqPQkbFIRtffLbrj+UXE/VEyzAuA59CKY0/Hc6EvvSv4fjL6
+7QfkaICjAdQbM2jZjkM4A8SMnXKoTVK7ro7fHxFRU2vhFKn5OTQSsRcCmq6c/0Bt
+9QtZgVVC8V25qEFuBIfFzxtQ6LZYbl7f4P+E0+vjD50uRg7yEYRIJ1Tp2oMzfIIN
+q2DfcR6GwKGGP6sTNdB+zNgsS3qWto6LgGzHHqstaRMGSZRM6ERAqw+CMIwGaKxZ
+j+0x8NrljTisyjTSCu2QPA7kfJnnr3OBcwzMeeIH7FPotiFBoNi8cBYvylfLmu1p
+LpQYrsEGX31irtmrNv2xmv16O6gtvUSnmryAoTOQIyBHd9dmIPn5D2mImora+pTP
+WiTGicGEUZXsJJSsn1YXItyi3feumdMwW1xFZv9KITOoPpHqkFYKvH9L2JRtkIyv
+o6KGrguVvNgiTlEuob6qk4YyZwLEN7z4tNN2SBBH4JaEUtWTOv67geXgUDI0S4qz
+OIGVvc0r6879d+T9Iwh6vMASdYs4gQFsRetu+Rg7LkA=
diff --git a/cloud/alwatr/soffit-order/env/soffit-order-canary.env b/cloud/alwatr/soffit-order/env/soffit-order-canary.env
@@ -0,0 +1,14 @@
+U2FsdGVkX1/QMafYU8j0hrbuav5fwXarZaE/R5x3HlxdfNT7gK0E30HOIIu/l915
+ykzuxRtH8j75dddn5TUnE/fdZ8dp5Qw6r0a/YpyS9jRRRHlhnABCRbykLIO5QI4W
+lcW2PahfKmtgAT5mN2HIEoqupqmU12R1gnErdLQ/pRPsr3x+kmlDKHrRwl3zwW+R
+aIvsuSjtlMpq8YrMuDWa8gKxDjaFpdf7eHf05+xqvHPMgygJ1bC2gIMtEWKsnswM
+rEgY8wwilzBkaH8x/vgMmPu+rCw6TlW38XTZT84lX76iWaL39uc/aTNqMFX2umNW
+fe+m5n/Scp5bc8RrXdMCufeZhGUfW+2cnymiTDquW648Gna4cgYBjRoN9PzcZyjG
+O25KchSRUyDjKgM+AQ8edAEszdBI68BcNELdENjagpeuazkVCGrt8/FYDwOnigTk
+Vh2J9uIIuTWVKtu14larRJPFIBDL9Zc7zXPYYD4h6TQ1y45ePHopFVA8yJOlMdIG
+OxhLnhs13x1PbYGgI5NG2JoLBu/3paD0PmnegTeLpD9reqKdQ/OXboY6Bxlc421H
+5LG69dP1NWpAHniWOlR/qLaeSaH7K0dr7YpCkRXKqGTyPefewqbuV9Kck/+RiS6T
+FNmAoyh6XByfckgyGbAaGjrV7NlnTiPGNm1xPCk6z17LGERYUT6KxU3eDy5pL+Hl
+G2npJWIQdQ0XoqytrxpqkzQF/sk3/QwWSZMKQffJEyaa9CMlzpegFRUCKtIbW4cU
+tICD/7soLHGWyYr9MZR8d7+ZA7e8MtPsPulElExpYrBHGIqgG6l25h/RIk/PjeyI
+gz8kTDhanIhK95TBrwjo3A==
diff --git a/cloud/alwatr/soffit-order/env/soffit-order.env b/cloud/alwatr/soffit-order/env/soffit-order.env
@@ -0,0 +1,14 @@
+U2FsdGVkX18XfvTqRGSYXYdEKCMHenYDNdBfj8O9FufqATkA3Lhk+GMQ6nwKF7jU
+Siy+pLqcqYVOBGSuc78Rlg2lBEr/vzAkx4LWl3jsHF4zCvzwlH1WN48U28yd5yUG
+t2DsjhnthT/jrQJF2uIG0jPDaMFgiOVIBnc25ny2JWDzuYbSSm6dQEoNmGk+UYjE
+SGUOhmf80+jDD8mxbZHS2z8tjOnV4j/uMxgxebyRfjsDvjtX8PcrWOJByfzrA+Bk
+aBs8DEm2qR0XyuufFDpEYHnscEAtqCXMYQIJSkGbhODM0zkBynYk92XLYQ6OGHg7
+Q581B6sKtqvGg5X5xDxU2xmhwscdnq0giz8oWbWZU0Wq5BOUCEB157mnDDg3PHjE
+YWnaJ5iEraF2zKaxYdmlM60tQzeJ7bvj/J+e/if+dfZ178yBjrULDwCC9j4948BA
+B2gi1FHLUlYHMAzwlwBV55YKvCeMJS8rK7pLGfV2TzIkeqTQ6++1m2SOchETLlsX
+hjHO2IZb0ERrDYDxqsFsXcifzOPBOtnWViRbxBfwxZOutXnb4gi7Gscml/DZT49g
+DvP4UA5ffsEkQC3Lyq1OwMtP4k2RxrkJkfduLQeav3HuDVxJTdUf6E4mVhZwnAfS
+tu04PYFzZuj77S7kA9LJ8fcmGkxDufPo+TBL2VZT16jnP8CL3z6jIEOelpWfbjGF
+xQl0Qded5K/GGZvMQn+6j39oCAOLtxfE6Sn5+rZnDOSHfPgRw8Z1SJ7kzGhFlkde
+bBsLWjZrShhse1v3LBSwjIgsqL09YVIEPPTUaG47yLheT04Iwna4iRBXe0OaPpPe
+fFigZxLlQyg6iwlwDJjoMQ==
diff --git a/cloud/classic/soffit-pwa/compose.yml → cloud/alwatr/soffit-ws/compose.yml b/cloud/classic/soffit-pwa/compose.yml → cloud/alwatr/soffit-ws/compose.yml
@@ -6,7 +6,7 @@ networks:
 
 services:
   pwa:
-    image: ghcr.io/alimd/soffit-pwa:${PWA_VERSION:-next}
+    image: ghcr.io/alimd/soffit-pwa:${PWA_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -17,6 +17,9 @@ services:
     networks:
       alwatr-public-network:
 
+    environment:
+      - NGINX_ACCESS_LOG=${PWA_ACCESS_LOG:-off}
+
     logging:
       driver: json-file
       options:
@@ -31,7 +34,7 @@ services:
       traefik.frontend.redirect.entryPoint: https
 
   storage-server:
-    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION:-next}
+    image: ghcr.io/alimd/storage-server:${STORAGE_SERVER_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024
@@ -65,7 +68,7 @@ services:
         max-file: '2'
 
   form-registration:
-    image: ghcr.io/alimd/form-registration:${FORM_REGISTRATION_VERSION:-next}
+    image: ghcr.io/alimd/form-registration:${FORM_REGISTRATION_VERSION}
 
     cpu_count: 1
     cpu_shares: 1024

diff --git a/cloud/alwatr/soffit-ws/deploy.sh b/cloud/alwatr/soffit-ws/deploy.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source ../../classic/lib/deploy.sh
diff --git a/cloud/alwatr/soffit-ws/env/soffit-beta.env b/cloud/alwatr/soffit-ws/env/soffit-beta.env
@@ -0,0 +1,12 @@
+U2FsdGVkX1+flE226wHyx0dIkuvhyCKgKinnJuXZmzT4kfruRMC0VZCxVXGK0zp6
+FCG8LobRGg5QPg25onE9Er5UaS3nDs0AWq0zTQ+Y4uqQYYOXsT/lAxJ05vlDedCn
+Wk9SeyNgiUKMcMFPFCA658xA457iTlF45qJJ4wcInlxy+JrYr2i9D9gsx+AqbRva
+zYxbtUSc3ajhfayrK8+RudOA/Qo87KvoKRgTIVhZDXbo0jGxlF23Ii+99aI8S5fz
+ale3XXfHfkXpDaKR7nxkIFejj1//13IZl2CViDOGFSyBMCqHaDdA4lsx2MeOVmZA
+d8SblW24VEmcBjToh9qvV/THt6sJe//VOHe3JVloAbwejR+i/3lLBYaf4Hrt6mYd
+9PqoZvBcY0TSVXlX1rPXJi7va0j2dYm/ViJ7Ss6Rm19n77ou0wepISxrsTXFXvXp
+KSGzHk/lnQ4VoDNk6doy+tHxvNBNsDCGoebr+CIAOHSQQEKHjw7uCzPCpgkrrvnT
+1326JndRdM0mM+eJBO7KDy/eE7wdOfv57j5nk9EGvXBZJOLz332csH+9qerH/jHe
+s86qZOWP1wiEZsQyHJAJ/yUMIhGT57o9d8mcv2yX6ihemDbHHMtU9Lt+xDX6T6YR
+dyiXIOPUjE9ahDM3ANRXm7WOLGhGzlDPs/Chqxrw3IqeimYL/sKG3YQ+AkR85AVc
+4z0Z3cQL8Xaa0az9mnIqypLxTYHZnafu8zAR0LfCzgQ=
diff --git a/cloud/alwatr/soffit-ws/env/soffit.env b/cloud/alwatr/soffit-ws/env/soffit.env
@@ -0,0 +1,12 @@
+U2FsdGVkX1+HrsqdZB2dZG71LofzoQJwF2iogPjFqjeP0YUKSXjpRinW+iYExrT4
+JcU/r9R/PpovAi2t0qx+0YbEAkso0OHw2M+YAHHu6pVnlhiAVjYITr6XiHGKGmSK
+Fwhxi9h2Bqw8H6weUiYcoAbhD/zC3e9g4KHQqspiaFrNzbU91zTcthLe9+G+qVgy
+fxkYIDgKfo4Pgk6x+8251ZTx03jElxjZiU+hEqA+kxyb125JFEoczDaK0yZTPFRo
+DMPyAZ8fMVCjCK3XgmxIyHXz4qRXxQ0Enjg/MS00P9Sm+CIj/yZ17SqpCdzd/j/V
+Qmpi4ah1pwkF7cGH4Gtgnq4IC7hxgVBQphpYXgFS4NU1/Hz0TW8Dr+GMoUAYOruP
+rXgJzbc/eSAXniwq9Bd6AgGi8uxxrhGHCCMdgdV7LBQE71slXo86XWhHMnxKTBNr
+4NUP9OYQSb8rM3m/HPq7AzQDf9WtSlxKCy08BqD6s8JrrdtyIbIAV9HE/EfisyUf
+0NATkIN+TynQSjAcGqiiQUlB4YcuzdYM1bgEqMCbp62bHf/s5lUp2pUhDG3+Ft+n
+X8leWZA14da/awYvE+GXC4kRh610stfGWpZj/jj4GW+tWeCo56dotYRyhhEPRaZG
+3yXThrPiZpfsuP8NS0ZT63h/5bGnKEXIrlzOy4rmFtw7/6alBWnTyrMjOuJeuSUP
+XOndQ064L1cseByZXGonYXnA6MqA3CgFOrEVXlZD6pArpWqE1RSMesZByJpX1omt
diff --git a/cloud/classic/com-pwa/deploy.sh b/cloud/classic/com-pwa/deploy.sh
diff --git a/cloud/classic/com-pwa/env/soffit-order-beta.env b/cloud/classic/com-pwa/env/soffit-order-beta.env
diff --git a/cloud/classic/com-pwa/env/soffit-order-canary.env b/cloud/classic/com-pwa/env/soffit-order-canary.env
diff --git a/cloud/classic/com-pwa/env/soffit-order.env b/cloud/classic/com-pwa/env/soffit-order.env
diff --git a/cloud/classic/flight-finder/deploy.sh b/cloud/classic/flight-finder/deploy.sh
diff --git a/cloud/classic/flight-finder/env/example.env b/cloud/classic/flight-finder/env/example.env
diff --git a/cloud/classic/soffit-pwa/deploy.sh b/cloud/classic/soffit-pwa/deploy.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/usr/bin/env bash

		source ../../classic/lib/deploy.sh