Change yarn -> pnpm overpass-turbo and Docker images for Tiler (#705)

* Fixed pnpm

* Fixed communication - layer name

* Update docker images and volume for prod deployment

Author: Rub21

.github/workflows/chartpress.yaml

@@ -4,7 +4,7 @@ on:
     branches:
       - 'main'
       - 'staging'
-      - 'communication_and_street'
+      - 'fixed_pnpm'
 jobs:
   build:
     runs-on: ubuntu-22.04
@@ -71,7 +71,7 @@ jobs:
           OHM_SLACK_WEBHOOK_URL: ${{ secrets.OHM_SLACK_WEBHOOK_URL }}
       ################ Staging secrets ################ 
       - name: Staging - substitute secrets
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fixed_pnpm'
         uses: bluwy/substitute-string-action@v1
         with:
           _input-file: 'values.staging.template.yaml'
@@ -189,14 +189,14 @@ jobs:
           PRODUCTION_OPENSTREETMAP_AUTH_SECRET: ${{ secrets.PRODUCTION_OPENSTREETMAP_AUTH_SECRET }}
 
       - name: AWS Credentials
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fixed_pnpm'
         uses: aws-actions/configure-aws-credentials@v1
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           aws-region: us-east-1
       - name: Setup Kubectl and Helm Dependencies
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fixed_pnpm'
         run: |
           sudo pip install awscli --ignore-installed six
           sudo curl -L -o /usr/bin/kubectl https://amazon-eks.s3.us-west-2.amazonaws.com/1.17.7/2020-07-08/bin/linux/amd64/kubectl
@@ -210,22 +210,22 @@ jobs:
           helm version
 
       - name: Update kube-config staging
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fixed_pnpm'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-staging
       - name: Update kube-config prod
         if: github.ref == 'refs/heads/main'
         run: aws eks --region us-east-1 update-kubeconfig --name osmseed-production-v2
       - name: Add Helm repository
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fixed_pnpm'
         run: |
           helm repo add osm-seed https://osm-seed.github.io/osm-seed-chart/
           helm repo update
       - name: Install helm dependencies for
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/fixed_pnpm'
         run: cd ohm && helm dep up
       # Staging
       - name: Staging - helm deploy
-        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/communication_and_street'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fixed_pnpm'
         run: helm upgrade --install staging --wait ohm/ -f values.staging.yaml -f ohm/values.yaml
       # Production
       - name: Production - helm deploy

.github/workflows/frontend-overpass.yaml

@@ -5,6 +5,7 @@ on:
     branches:
       - "main"
       - "staging"
+      - "fixed_pnpm"
 
 jobs:
   build:
@@ -20,7 +21,7 @@ jobs:
           access_token: ${{ github.token }}
 
       - name: Set environment variables - Staging
-        if: github.ref == 'refs/heads/staging'
+        if: github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/fixed_pnpm'
         uses: allenevans/[email protected]
         with:
           OVERPASS_API: overpass-api.openhistoricalmap.org
@@ -55,11 +56,11 @@ jobs:
         working-directory: overpass-turbo
 
       - name: Install dependencies
-        run: yarn install
+        run: pnpm install
         working-directory: overpass-turbo
 
       - name: Build project
-        run: yarn build
+        run: pnpm build
         working-directory: overpass-turbo
 
       - name: Setup Python

hetzner/tiler/tiler.base.yml

@@ -1,7 +1,7 @@
 services:
   tiler_server:
     container_name: tiler_server
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     # image: tiler-server:staging
     # build:
     #   context: ../../images/tiler-server
@@ -15,14 +15,6 @@ services:
     #   - ../../images/tiler-server/start.sh:/app/start.sh:ro
     networks:
       - ohm_network
-
-volumes:
-  tiler_pgdata:
-    driver: local
-    name: tiler_db_11_02
-  tiler_imposm_data:
-    driver: local
-    name: tiler_imposm_11_02
 
 networks:
   ohm_network:

hetzner/tiler/tiler.production.yml

@@ -16,7 +16,7 @@ services:
 
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
+    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3294.h12c71f95
     volumes:
       - tiler_imposm_data:/mnt/data
     env_file:
@@ -38,7 +38,7 @@ services:
   # Tiler server
   tiler_server:
     container_name: tiler_server
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     # ports:
     #   - "9090:9090"
     restart: always
@@ -81,7 +81,7 @@ services:
 
   tile_global_seeding:
     container_name: tiler_global_seeding
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     env_file:
       - .env.tiler
     volumes:
@@ -96,7 +96,7 @@ services:
 
   tile_coverage_seeding:
     container_name: tiler_coverage_seeding
-    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3225.h2122f3e
+    image: ghcr.io/openhistoricalmap/tiler-server:0.0.1-0.dev.git.3296.h0e45d176
     volumes:
       - ./seed.sh:/opt/seed.sh
     entrypoint:
@@ -128,10 +128,10 @@ services:
 volumes:
   tiler_pgdata:
     driver: local
-    name: tiler_db_11_02
+    name: tiler_db_25_02
   tiler_imposm_data:
     driver: local
-    name: tiler_imposm_11_02
+    name: tiler_imposm_25_02
 
 networks:
   ohm_network:

hetzner/tiler/tiler.staging.yml

@@ -12,19 +12,19 @@ services:
       - postgres
       - "-c"
       - "config_file=/etc/postgresql/postgresql.conf"
-    # ports:
-    #   - "54321:5432"
+    ports:
+      - "5432:5432"
     env_file:
       - .env.tiler
     networks:
       - ohm_network
   tiler_imposm:
     container_name: tiler_imposm
-    image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
-    # image: tiler-imposm:staging
-    # build: 
-    #   context: ../../images/tiler-imposm
-    #   dockerfile: Dockerfile
+    # image: ghcr.io/openhistoricalmap/tiler-imposm:0.0.1-0.dev.git.3208.h6ef73bb
+    image: tiler-imposm:staging
+    build: 
+      context: ../../images/tiler-imposm
+      dockerfile: Dockerfile
     volumes:
       - tiler_imposm_data:/mnt/data
     command:
@@ -41,15 +41,7 @@ volumes:
   tiler_pgdata:
     driver: local
     name: tiler_db_11_02
-    driver_opts:
-      type: none
-      o: bind
-      device: /mnt/HC_Volume_104590709/staging/tiler/pgdata
 
   tiler_imposm_data:
     driver: local
     name: tiler_imposm_11_02
-    driver_opts:
-      type: none
-      o: bind
-      device: /mnt/HC_Volume_104590709/staging/tiler/imposmdata

images/tiler-server/config/providers/communication_lines.toml

@@ -116,19 +116,19 @@ WHERE
 """
 #######Maps
 [[maps.layers]]
-name = "communication"
+name = "communication_lines"
 provider_layer = "ohm.communication_z10_12"
 min_zoom = 10
 max_zoom = 12
 
 [[maps.layers]]
-name = "communication"
+name = "communication_lines"
 provider_layer = "ohm.communication_z13_15"
 min_zoom = 13
 max_zoom = 15
 
 [[maps.layers]]
-name = "communication"
+name = "communication_lines"
 provider_layer = "ohm.communication_z16_20"
 min_zoom = 16
 max_zoom = 20