fixup! feature(alpha-deployment): Docker setup and alpha deployment

Author: frozenhelium

.env

@@ -1,6 +1,6 @@
-VITE_BASE_URL=
+VITE_BASE_URL='https://mapswipe.org/privacy'
 VITE_PRIVACY_POLICY_URL='https://mapswipe.org/privacy/'
-VITE_IMPRINT_URL=
+VITE_IMPRINT_URL="https://mapswipe.org/privacy/"
 VITE_APP_LOGO='./img/mapswipe-white.svg'
 VITE_PROJECTS_FALLBACK_IMAGE="./img/map-pin-600x400.jpg"
 VITE_ALLOW_UNVERIFIED_USERS=true
@@ -24,5 +24,5 @@ VITE_THEME_LIGHT_NEUTRAL="#272727"
 # App Attribution
 VITE_APP_NAME="MapSwipe"
 VITE_APP_WEBSITE_URL="https://mapswipe.org"
-VITE_APP_ATTRIBUTION_TITLE=
-VITE_APP_ATTRIBUTION_URL=
+VITE_APP_ATTRIBUTION_TITLE="MapSwipe"
+VITE_APP_ATTRIBUTION_URL="https://mapswipe.org/privacy/"

Dockerfile

@@ -14,73 +14,66 @@ WORKDIR /code
 # Build stage for web app
 FROM dev AS web-app-serve-build
 
-COPY ./package.json /code/
+COPY ./package.json ./yarn.lock /code/
 
 RUN yarn install
-
 COPY . /code/
 
-# NOTE: These are set directly in `vite.config.ts`
-# We're using raw web-app-serve placeholder values here to treat them as dynamic values
-# NOTE: Static env variables:
-# These env variables are use during build
-ENV VITE_FIREBASE_API_KEY=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_API_KEY
-ENV VITE_FIREBASE_AUTH_DOMAIN=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_AUTH_DOMAIN
-ENV VITE_FIREBASE_DATABASE_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_DATABASE_URL
-ENV VITE_FIREBASE_PROJECT_ID=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_PROJECT_ID
-ENV VITE_FIREBASE_STORAGE_BUCKET=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_STORAGE_BUCKET
-ENV VITE_FIREBASE_MESSAGING_SENDER_ID=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_MESSAGING_SENDER_ID
-ENV VITE_FIREBASE_APP_ID=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_APP_ID
-ENV VITE_FIREBASE_MEASUREMENT_ID=WEB_APP_SERVE_PLACEHOLDER_VITE_FIREBASE_MEASUREMENT_ID
-
-ENV VITE_COMMUNITY_DASHBOARD_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_COMMUNITY_DASHBOARD_URL
-ENV VITE_BASE_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_BASE_URL
-ENV VITE_PRIVACY_POLICY_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_PRIVACY_POLICY_URL
-ENV VITE_IMPRINT_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_IMPRINT_URL
-ENV VITE_APP_LOGO=WEB_APP_SERVE_PLACEHOLDER_VITE_APP_LOGO
-ENV VITE_PROJECTS_FALLBACK_IMAGE=WEB_APP_SERVE_PLACEHOLDER_VITE_PROJECTS_FALLBACK_IMAGE
-ENV VITE_ALLOW_UNVERIFIED_USERS=WEB_APP_SERVE_PLACEHOLDER_VITE_ALLOW_UNVERIFIED_USERS
+ENV VITE_FIREBASE_API_KEY=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_API_KEY
+ENV VITE_FIREBASE_AUTH_DOMAIN=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_AUTH_DOMAIN
+ENV VITE_FIREBASE_DATABASE_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_DATABASE_URL
+ENV VITE_FIREBASE_PROJECT_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_PROJECT_ID
+ENV VITE_FIREBASE_STORAGE_BUCKET=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_STORAGE_BUCKET
+ENV VITE_FIREBASE_MESSAGING_SENDER_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_MESSAGING_SENDER_ID
+ENV VITE_FIREBASE_APP_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_APP_ID
+ENV VITE_FIREBASE_MEASUREMENT_ID=WEB_APP_SERVE_PLACEHOLDER__VITE_FIREBASE_MEASUREMENT_ID
+
+ENV VITE_COMMUNITY_DASHBOARD_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_COMMUNITY_DASHBOARD_URL
+ENV VITE_BASE_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_BASE_URL
+ENV VITE_PRIVACY_POLICY_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_PRIVACY_POLICY_URL
+ENV VITE_IMPRINT_URL=WEB_APP_SERVE_PLACEHOLDER__VITE_IMPRINT_URL
+
+ENV VITE_APP_LOGO=WEB_APP_SERVE_PLACEHOLDER__VITE_APP_LOGO
+ENV VITE_PROJECTS_FALLBACK_IMAGE=WEB_APP_SERVE_PLACEHOLDER__VITE_PROJECTS_FALLBACK_IMAGE
+ENV VITE_ALLOW_UNVERIFIED_USERS=WEB_APP_SERVE_PLACEHOLDER__VITE_ALLOW_UNVERIFIED_USERS
 
 # Locales
-ENV VITE_DEFAULT_LOCALE=WEB_APP_SERVE_PLACEHOLDER_VITE_DEFAULT_LOCALE
-ENV VITE_FALLBACK_LOCALE=WEB_APP_SERVE_PLACEHOLDER_VITE_FALLBACK_LOCALE
-ENV VITE_SUPPORTED_LOCALES=WEB_APP_SERVE_PLACEHOLDER_VITE_SUPPORTED_LOCALES
+ENV VITE_DEFAULT_LOCALE=WEB_APP_SERVE_PLACEHOLDER__VITE_DEFAULT_LOCALE
+ENV VITE_FALLBACK_LOCALE=WEB_APP_SERVE_PLACEHOLDER__VITE_FALLBACK_LOCALE
+ENV VITE_SUPPORTED_LOCALES=WEB_APP_SERVE_PLACEHOLDER__VITE_SUPPORTED_LOCALES
 
 # Theme
-ENV VITE_THEME_LIGHT_PRIMARY=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_PRIMARY
-ENV VITE_THEME_LIGHT_SECONDARY=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_SECONDARY
-ENV VITE_THEME_LIGHT_TERTIARY=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_TERTIARY
-ENV VITE_THEME_LIGHT_ACCENT=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_ACCENT
-ENV VITE_THEME_LIGHT_ERROR=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_ERROR
-ENV VITE_THEME_LIGHT_WARNING=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_WARNING
-ENV VITE_THEME_LIGHT_INFO=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_INFO
-ENV VITE_THEME_LIGHT_SUCCESS=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_SUCCESS
-ENV VITE_THEME_LIGHT_NEUTRAL=WEB_APP_SERVE_PLACEHOLDER_VITE_THEME_LIGHT_NEUTRAL
-
-# App Attribution
-ENV VITE_APP_NAME=WEB_APP_SERVE_PLACEHOLDER_VITE_APP_NAME
-ENV VITE_APP_WEBSITE_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_APP_WEBSITE_URL
-ENV VITE_APP_ATTRIBUTION_TITLE=WEB_APP_SERVE_PLACEHOLDER_VITE_APP_ATTRIBUTION_TITLE
-ENV VITE_APP_ATTRIBUTION_URL=WEB_APP_SERVE_PLACEHOLDER_VITE_APP_ATTRIBUTION_URL
-
-ENV APPLY_CONFIG__ENABLE_DEBUG=false
-ENV APPLY_CONFIG__DEBUG_USE_BIOME=true
-
-ENV APPLY_CONFIG__DESTINATION_DIRECTORY=/usr/share/nginx/html/
-ENV APPLY_CONFIG__APPLY_CONFIG_PATH=/web-app-serve/default-app-apply-config.sh
+ENV VITE_THEME_LIGHT_PRIMARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_PRIMARY
+ENV VITE_THEME_LIGHT_SECONDARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_SECONDARY
+ENV VITE_THEME_LIGHT_TERTIARY=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_TERTIARY
+ENV VITE_THEME_LIGHT_ACCENT=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_ACCENT
+ENV VITE_THEME_LIGHT_ERROR=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_ERROR
+ENV VITE_THEME_LIGHT_WARNING=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_WARNING
+ENV VITE_THEME_LIGHT_INFO=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_INFO
+ENV VITE_THEME_LIGHT_SUCCESS=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_SUCCESS
+ENV VITE_THEME_LIGHT_NEUTRAL=WEB_APP_SERVE_PLACEHOLDER__VITE_THEME_LIGHT_NEUTRAL
+
+ENV VITE_APP_NAME=MapSwipe
+ENV VITE_APP_WEBSITE_URL=https://mapswipe.org
+ENV VITE_APP_ATTRIBUTION_TITLE=MapSwipe
+ENV VITE_APP_ATTRIBUTION_URL=https://mapswipe.org/privacy/
 
 RUN WEB_APP_SERVE_ENABLED=true yarn build-only --outDir=/code/build
 
-COPY ./src/ /web-app-serve/
+# FROM web-app-serve AS web-app-serve-example
 
-FROM web-app-serve AS web-app-serve-example
+# LABEL maintainer="Togglecorp"
+FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve
 
-LABEL maintainer="Togglecorp"
 LABEL org.opencontainers.image.source="github.com/mapswipe/mapswipe-web"
+LABEL org.opencontainers.image.authors="[email protected]"
 
-FROM ghcr.io/toggle-corp/web-app-serve:v0.1.2 AS web-app-serve
 
 # Env for apply-config script
 ENV APPLY_CONFIG__SOURCE_DIRECTORY=/code/build/
 
+COPY ./web-app-serve/web-app-apply-config.sh /code/
+ENV APPLY_CONFIG__APPLY_CONFIG_PATH=/code/web-app-apply-config.sh
+RUN ls /code/
+
 COPY --from=web-app-serve-build /code/build "$APPLY_CONFIG__SOURCE_DIRECTORY"

docker.compose.yml

@@ -56,7 +56,5 @@ export default defineConfig({
         VITE_COMMUNITY_DASHBOARD_URL: Schema.string.optional(),
 
         VITE_MAPILLARY_API_KEY: Schema.string.optional(),
-
-        VITE_OSM_OAUTH_REDIRECT_URI: Schema.string.optional(),
     },
 });

env.d.ts

@@ -17,7 +17,6 @@
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "^6.0.8",
-    "@julr/vite-plugin-validate-env": "github:toggle-corp/vite-plugin-validate-env#v2.2.0-tc.1",
     "base-64": "^1.0.0",
     "firebase": "^11.8.1",
     "mapillary-js": "^4.1.2",
@@ -37,6 +36,7 @@
     "vuetify": "^3.3.16"
   },
   "devDependencies": {
+    "@julr/vite-plugin-validate-env": "git+https://github.com/toggle-corp/vite-plugin-validate-env#v2.2.0-tc.1",
     "@mdi/font": "^7.4.47",
     "@playwright/test": "^1.38.0",
     "@rushstack/eslint-patch": "^1.3.3",

env.ts

@@ -1,3 +1,4 @@
+import { ValidateEnv as validateEnv } from '@julr/vite-plugin-validate-env';
 import { fileURLToPath, URL } from 'node:url'
 import { resolve, dirname } from 'node:path'
 import { defineConfig } from 'vite'
@@ -11,6 +12,9 @@ export default defineConfig({
   plugins: [
     vue(),
     vueJsx(),
+    validateEnv({
+      configFile: 'env',
+    }),
     VueI18nPlugin({
       runtimeOnly: false,
       include: resolve(dirname(fileURLToPath(import.meta.url)), './src/i18n/locales/**'),

package.json

@@ -5,4 +5,4 @@ set -xe
 while IFS='=' read -r KEY VALUE; do
     # FIXME: If js and value is empty string, replace it with undefined?
     find "$DESTINATION_DIRECTORY" -type f -exec sed -i "s|\<WEB_APP_SERVE_PLACEHOLDER__$KEY\>|$VALUE|g" {} +
-done < <(env | grep '^VITE_')
+done < <(env | grep '^VITE_')

vite.config.ts

@@ -1102,9 +1102,9 @@
   integrity sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==
 
 "@quansync/fs@^0.1.1":
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/@quansync/fs/-/fs-0.1.3.tgz#2328aec83fef343b72c73ca77ca08e1e12bcf9d9"
-  integrity sha512-G0OnZbMWEs5LhDyqy2UL17vGhSVHkQIfVojMtEWVenvj0V5S84VBgy86kJIuNsGDp2p7sTKlpSIpBUWdC35OKg==
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/@quansync/fs/-/fs-0.1.4.tgz#07acd361fcacc4febe7103866539d44123691666"
+  integrity sha512-vy/41FCdnIalPTQCb2Wl0ic1caMdzGus4ktDp+gpZesQNydXcx8nhh8qB3qMPbGkictOTaXgXEUUfQEm8DQYoA==
   dependencies:
     quansync "^0.2.10"