Merge pull request #102 from govlt/docker-image-glyphs-and-sprites

Docker image glyphs and sprites

.github/actions/build-pbf-glyphs/action.yml

@@ -0,0 +1,23 @@
+name: Build pbf glyphs
+description: Build pbf glyphs
+
+inputs:
+  output-directory:
+    description: Required input set output directory
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Restore Rust cache
+      uses: Swatinem/rust-cache@v2
+      with:
+        prefix-key: pbf-glyphs
+
+    - name: Install build_pbf_glyphs
+      run: cargo install build_pbf_glyphs
+      shell: bash
+
+    - name: Build PBF glyphs
+      run: mkdir -p ${{ inputs.output-directory }} && build_pbf_glyphs vector/styles/fonts ${{ inputs.output-directory }}
+      shell: bash

.github/actions/build-sprites/action.yml

@@ -0,0 +1,31 @@
+name: Build sprites
+description: Build sprites
+
+inputs:
+  output-directory:
+    description: Required input set output directory
+    required: true
+
+runs:
+  using: composite
+  steps:
+    - name: Restore Rust cache
+      uses: Swatinem/rust-cache@v2
+      with:
+        prefix-key: sprites
+
+    - name: Install spreet
+      run: cargo install spreet
+      shell: bash
+
+    - name: Build sprites
+      shell: bash
+      run: |
+        styles=("positron" "bright" "openmaptiles")
+        for style in "${styles[@]}"; do
+          mkdir -p ${{ inputs.output-directory }}/"$style"
+        
+          spreet --unique --minify-index-file vector/styles/"$style"/sprites ${{ inputs.output-directory }}/"$style"
+          spreet --retina --unique --minify-index-file vector/styles/"$style"/sprites ${{ inputs.output-directory }}/"$style"@2x
+        done
+

.github/workflows/reusable-workflow-publish-basemap-vector.yml

@@ -104,6 +104,9 @@ jobs:
         ports:
           - 3000:3000
     steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
       - uses: actions/download-artifact@v4
         with:
           name: vector-basemap-pmtiles
@@ -116,14 +119,24 @@ jobs:
         run: curl http://localhost:3000/vector --create-dirs -o "tiles/tile.json" --compressed -s -S
 
       - name: Change tiles url
-        run: jq '.tiles = ["'"${TILES}"'"]' tile.json > tile.json.tmp && mv tile.json.tmp tile.json
+        run: jq --compact-output '.tiles = ["'"${TILES}"'"]' tile.json > tile.json.tmp && mv tile.json.tmp tile.json
         working-directory: tiles
         env:
           TILES: http://localhost:80/{z}/{x}/{y}.pbf
 
       - name: Generate pbfs
         run: tail -n +2 zxy.tsv | parallel --colsep '\t' curl "http://localhost:3000/vector/{1}/{2}/{3}" --create-dirs -s -S -o "tiles/{1}/{2}/{3}.pbf" --compressed
 
+      - name: Generate glyphs
+        uses: ./.github/actions/build-pbf-glyphs
+        with:
+          output-directory: tiles/font
+
+      - name: Generate sprites
+        uses: ./.github/actions/build-sprites
+        with:
+          output-directory: tiles/sprite
+
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -157,7 +170,7 @@ jobs:
           destination-path: /tiles/vector/pbf
 
   publish-basemap-vector-docker-image:
-    name: Vector static docker image build and push
+    name: Vector docker image build and push
     runs-on: ubuntu-latest
     timeout-minutes: 30
     needs: generate-basemap-vector-pbf-tiles

.github/workflows/reusable-workflow-publish-page.yml

@@ -72,12 +72,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      - name: Restore Rust cache
-        uses: Swatinem/rust-cache@v2
-
-      - name: Install spreet
-        run: cargo install spreet
-
       - name: Minify styles
         run: find vector/styles -name "style.json" -print0 | xargs -0 -I{} sh -c 'jq -c . "{}" > tmp.json && mv tmp.json "{}"'
 
@@ -118,12 +112,18 @@ jobs:
           
             cp -r vector/styles/"$style"/style.json output/styles/"$style"/style.json
             cp -r vector/styles/"$style"/style-pmtiles.json output/styles/"$style"/style-pmtiles.json
-            cp -r vector/styles/"$style"/glyphs/. output/font
-          
-            spreet --unique --minify-index-file vector/styles/"$style"/sprites output/sprite/"$style"
-            spreet --retina --unique --minify-index-file vector/styles/"$style"/sprites output/sprite/"$style"@2x
           done
 
+      - name: Generate glyphs
+        uses: ./.github/actions/build-pbf-glyphs
+        with:
+          output-directory: output/font
+
+      - name: Generate sprites
+        uses: ./.github/actions/build-sprites
+        with:
+          output-directory: output/sprite
+
       - name: Upload styles artifact
         uses: actions/upload-artifact@v4
         with:

vector/docker/Dockerfile

@@ -27,7 +27,7 @@ WORKDIR /opt/vector
 COPY --chown=$USER:$USER vector/docker/martin/config.yaml config.yaml
 
 # Fonts
-COPY --chown=$USER:$USER vector/styles/openmaptiles/fonts vector/styles/positron/fonts vector/styles/bright/fonts  fonts/
+COPY --chown=$USER:$USER vector/styles/fonts  fonts/
 
 # Sprites
 COPY --chown=$USER:$USER vector/styles/openmaptiles/sprites styles/openmaptiles/sprites

vector/preview/martin.Dockerfile

@@ -4,7 +4,7 @@ WORKDIR /opt/vector
 
 COPY docker/martin/config.yaml config.yaml
 
-COPY styles/openmaptiles/fonts styles/positron/fonts styles/bright/fonts  fonts/
+COPY styles/fonts  fonts/
 
 COPY styles/openmaptiles/sprites styles/openmaptiles/sprites
 COPY styles/positron/sprites styles/positron/sprites