Release 2024-11-12

.env.example

@@ -13,11 +13,11 @@ ENVIRONMENT=development
 DATABASE_HOST=db
 DATABASE_USER=postgres
 DATABASE_NAME=postgres
-DATABASE_PASSWORD='mysecretpassword'
+DATABASE_PASSWORD=mysecretpassword
 DATABASE_PORT=5432
 
 # Application flags
-OSM_DOWNLOAD_URL='http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf'
+OSM_DOWNLOAD_URL=http://download.geofabrik.de/europe/germany/berlin-latest.osm.pbf
 SKIP_DOWNLOAD=1 # skips the download if a file already exists
 SKIP_UNCHANGED=1 # skips processing of unchanged code
 SKIP_TAG_FILTER=0 # skips tag filtering
@@ -38,8 +38,8 @@ SYNOLOGY_ERROR_LOG_TOKEN=
 
 # NEXTJS
 NEXT_PUBLIC_APP_ORIGIN=http://127.0.0.1:5173
-NEXT_PUBLIC_APP_ENV='development' # 'staging', 'production'
-SESSION_SECRET_KEY='12345678901234567890123456789012'
+NEXT_PUBLIC_APP_ENV=development # staging, production
+SESSION_SECRET_KEY=12345678901234567890123456789012
 
 # MAP API KEYS (See Bitwarden "Atlas Secrets")
 # Source: https://account.mapbox.com/access-tokens/cl7079ubp09vs3osbzaovy3ge

.github/workflows/deploy-app.yml

@@ -36,13 +36,11 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Upgrade AWS CLI version and setup lightsailctl
+      - name: Upgrade AWS CLI version
         run: |
           curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           sudo ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
-          sudo curl "https://s3.us-west-2.amazonaws.com/lightsailctl/latest/linux-amd64/lightsailctl" -o "/usr/local/bin/lightsailctl"
-          sudo chmod +x /usr/local/bin/lightsailctl
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -54,7 +52,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Build app image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           file: ./app.Dockerfile
           context: ./
@@ -63,8 +61,8 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: |
-            public.ecr.aws/n0p8j4k5/atlas/blitz:${{ github.sha }}
-            public.ecr.aws/n0p8j4k5/atlas/blitz:${{ inputs.ENVIRONMENT }}-latest
+            public.ecr.aws/n0p8j4k5/atlas/app:${{ github.sha }}
+            public.ecr.aws/n0p8j4k5/atlas/app:${{ inputs.ENVIRONMENT }}-latest
           build-args: |
             NEXT_PUBLIC_APP_ENV=${{ inputs.NEXT_PUBLIC_APP_ENV }}
             NEXT_PUBLIC_APP_ORIGIN=${{ inputs.NEXT_PUBLIC_APP_ORIGIN }}
@@ -73,7 +71,7 @@ jobs:
       - name: Push image
         run: |
           aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/n0p8j4k5/
-          docker push --all-tags public.ecr.aws/n0p8j4k5/atlas/blitz
+          docker push --all-tags public.ecr.aws/n0p8j4k5/atlas/app
   restart_app:
     runs-on: ubuntu-latest
     needs: [diff_app, build_app]

.github/workflows/deploy-processing.yml

@@ -28,16 +28,14 @@ jobs:
       - name: Checkout Repository
         uses: actions/checkout@v4
 
-      - name: Upgrade AWS CLI version and setup lightsailctl
+      - name: Setup AWS CLI
         run: |
           aws --version
           curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
           unzip awscliv2.zip
           sudo ./aws/install --bin-dir /usr/local/bin --install-dir /usr/local/aws-cli --update
           which aws
           aws --version
-          sudo curl "https://s3.us-west-2.amazonaws.com/lightsailctl/latest/linux-amd64/lightsailctl" -o "/usr/local/bin/lightsailctl"
-          sudo chmod +x /usr/local/bin/lightsailctl
 
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
@@ -49,7 +47,7 @@ jobs:
       - name: Setup buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Build app image
+      - name: Build processing image
         uses: docker/build-push-action@v5
         with:
           context: .
@@ -59,13 +57,13 @@ jobs:
           cache-from: type=gha
           cache-to: type=gha,mode=max
           tags: |
-            public.ecr.aws/n0p8j4k5/atlas/app:${{ github.sha }}
-            public.ecr.aws/n0p8j4k5/atlas/app:${{ inputs.ENVIRONMENT }}-latest
+            public.ecr.aws/n0p8j4k5/atlas/processing:${{ github.sha }}
+            public.ecr.aws/n0p8j4k5/atlas/processing:${{ inputs.ENVIRONMENT }}-latest
 
-      - name: Push the app image
+      - name: Push the processing image
         run: |
           aws ecr-public get-login-password --region us-east-1 | docker login --username AWS --password-stdin public.ecr.aws/n0p8j4k5/
-          docker push --all-tags public.ecr.aws/n0p8j4k5/atlas/app
+          docker push --all-tags public.ecr.aws/n0p8j4k5/atlas/processing
   restart_processing:
     runs-on: ubuntu-latest
     needs: [diff_processing, build_processing]

.github/workflows/generate-tiles.yml

@@ -35,7 +35,9 @@ jobs:
             cd /srv/
             export WAIT_FOR_FRESH_DATA=1
             export SKIP_DOWNLOAD=0
+            export COMPUTE_DIFFS=0
             docker compose down processing
             docker compose up -d processing
             unset WAIT_FOR_FRESH_DATA
             unset SKIP_DOWNLOAD
+            unset COMPUTE_DIFFS

.github/workflows/setup-env.yml

@@ -39,8 +39,8 @@ jobs:
           host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USERNAME }}
           password: ${{ secrets.SSH_PASSWORD }}
-          source: "docker-compose.yml, docker-compose.network.yml, configs, .env.example, psql_shell.sh"
-          target: "/srv"
+          source: 'docker-compose.yml, docker-compose.network.yml, configs, .env.example, psql_shell.sh'
+          target: '/srv'
           overwrite: true
 
       - name: Stop & Start container on Server
@@ -79,4 +79,5 @@ jobs:
               -e "s|^S3_BUCKET=.*$|S3_BUCKET='${{ secrets.S3_BUCKET }}'|" \
               -e "s|^SKIP_DOWNLOAD=.*$|SKIP_DOWNLOAD='${{ vars.SKIP_DOWNLOAD }}'|" \
               -e "s|^SKIP_UNCHANGED=.*$|SKIP_UNCHANGED='${{ vars.SKIP_UNCHANGED }}'|" \
+              -e "s|^COMPUTE_DIFFS=.*$|COMPUTE_DIFFS='${{ vars.COMPUTE_DIFFS }}'|" \
               .env

app.Dockerfile

@@ -21,11 +21,11 @@
 
 RUN npx [email protected] build
 
 CMD npx [email protected] prisma migrate deploy && npx [email protected] start -p 4000
 
 # From here on we are building the production image
 FROM base AS production
 
 RUN npm install --global pm2
 
-CMD exec pm2-runtime node -- ./node_modules/next/dist/bin/next start -p 4000
+CMD npx [email protected] prisma migrate deploy && exec pm2-runtime node -- ./node_modules/next/dist/bin/next start -p 4000

app/.prettierrc

@@ -4,6 +4,6 @@
   "arrowParens": "always",
   "printWidth": 100,
   "plugins": ["prettier-plugin-organize-imports", "prettier-plugin-tailwindcss"],
-  "tailwindAttributes": ["positionClasses"],
+  "tailwindAttributes": ["positionClasses", "classNameOverwrite"],
   "tailwindFunctions": ["twMerge", "clsx", "twJoin"]
 }

app/db/seeds/bikelaneVerification.ts

@@ -1,4 +1,4 @@
-import { VerificationSchema } from 'src/bikelane-verifications/schemas'
+import { VerificationSchema } from '@/src/bikelane-verifications/schemas'
 import { z } from 'zod'
 import db from '../index'
 

app/next.config.js

@@ -35,6 +35,14 @@ module.exports = withBlitz(
         },
       ],
     },
+    // Source Maps on the Server
+    // Via https://www.highlight.io/blog/lw5-next-js-server-sourcemaps
+    webpack: (config, { isServer }) => {
+      if (isServer) {
+        config.devtool = 'source-map'
+      }
+      return config
+    },
     redirects: async () => [
       // https://stackoverflow.com/a/70184067
       {