Merge branch 'master' of github.com:fmidev/docker-smartmetserver

fmidev · Oct 2, 2024 · 708cb35 · 708cb35
2 parents 6119d11 + e14be9c
commit 708cb35
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 25 deletions.
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Docker login
       run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USER }} --password-stdin
     - name: Docker build

diff --git a/Dockerfile b/Dockerfile
@@ -3,7 +3,7 @@ LABEL maintainer "Mikko Rauhala <[email protected]>"
 LABEL license    "MIT License Copyright (c) 2023 FMI Open Development"
 
 ENV USER_NAME="smartmet" \
-    GOOGLE_FONTS="Lato Noto%20Sans Open%20Sans Poppins Roboto Ubuntu" 
+    GOOGLE_FONTS="Montserrat NotoSans OpenSans Roboto" 
 
 RUN dnf -y install https://download.fmi.fi/smartmet-open/rhel/9/x86_64/smartmet-open-release-latest-9.noarch.rpm && \
     dnf -y install yum-utils && \
@@ -34,9 +34,8 @@ RUN \
     for FONT in $GOOGLE_FONTS; \
     do \
         mkdir -p /usr/share/fonts/truetype/${FONT} && \
-        curl -s -S -o ${FONT}.zip "https://fonts.google.com/download?family=${FONT}" && \
-        unzip -o ${FONT}.zip -d /usr/share/fonts/truetype/${FONT} && \
-        rm -f ${FONT}.zip ; \
+        curl -s -S --output-dir /usr/share/fonts/truetype/${FONT}  "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}%5Bwdth,wght%5D.ttf" && \
+        curl -s -S --output-dir /usr/share/fonts/truetype/${FONT}  "https://github.com/google/fonts/raw/main/ofl/${FONT,,}/${FONT}-italic%5Bwdth,wght%5D.ttf" ; \
     done
 
 HEALTHCHECK --interval=30s --timeout=10s \

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -7,20 +7,20 @@ services:
     ports:
       - "8080:8080"
     volumes:
-      - model-fmi-hirlam:/smartmet/data/hirlam
+      - model-fmi-meps:/smartmet/data/meps
     restart: unless-stopped
-  hirlam-surface:
+  meps-surface:
     image: fmidev/fmidownloader
-    container_name: fmidownloader-hirlam-surface
+    container_name: fmidownloader-meps-surface
     command:
-      - "--producer=hirlam"
+      - "--producer=meps"
       - "--dir=surface"
-      - "--filename=hirlam_europe_surface"
+      - "--filename=meps_northeurope_surface"
       - "--parameters=Temperature,DewPoint,Humidity,WindDirection,WindSpeedMS,WindGust,TotalCloudCover,Precipitation1h,WeatherSymbol3,Pressure,CAPE,CIN"
     volumes:
-      - model-fmi-hirlam:/tmp
+      - model-fmi-meps:/tmp
     restart: unless-stopped
 
 volumes:
-  model-fmi-hirlam:
-    name: model-fmi-hirlam
+  model-fmi-meps:
+    name: model-fmi-meps
diff --git a/smartmetconf/engines/querydata.conf b/smartmetconf/engines/querydata.conf
@@ -9,6 +9,7 @@ valid_points_cache_dir = "/var/smartmet/cache/validpoints";
 producers =
 [	"meteor",
         "meps_surface",
+	"wrf_surface",
 	"ecmwf_surface",
 	"icon_surface",
 	"gfs_surface",
@@ -40,6 +41,19 @@ meteor:
         number_to_keep          = 4;
 };
 
+wrf_surface:
+{
+        alias                   = ["wrf", "wrf_surface"];
+        directory               = "/smartmet/data/wrf/surface";
+        pattern                 = ".*_wrf_.*_surface\.sqd$";
+        forecast                = true;
+        type                    = "grid";
+        leveltype               = "surface";
+        refresh_interval_secs   = 60;
+        number_to_keep          = 2;
+	multifile               = false;
+};
+
 ecmwf_surface:
 {
         alias                   = ["ecmwf", "ecmwf_surface"];
@@ -128,7 +142,7 @@ gem_pressure:
 
 gfs_surface:
 {
-        alias                   = "gfs";
+        alias                   = ["gfs","gfs_world_surface"];
         directory               = "/smartmet/data/gfs/surface";
         pattern                 = ".*_gfs_.*_surface\.sqd$";
         forecast                = true;
@@ -141,7 +155,7 @@ gfs_surface:
 
 gfs_pressure:
 {
-        alias                   = "gfs_pressure";
+        alias                   = "gfs_world_pressure";
         directory               = "/smartmet/data/gfs/pressure";
         pattern                 = ".*_gfs_.*_pressure\.sqd$";
         forecast                = true;

diff --git a/wms/customers/gfs/products/surface/precipitation.json b/wms/customers/gfs/products/surface/precipitation.json
@@ -1,7 +1,7 @@
 {
     "title" : "GFS Precipitation Rate",
     "abstract" : "Precipitation Rate from GFS",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "views": [{
         "layers": [{
             "qid": "l",

diff --git a/wms/customers/gfs/products/surface/pressure.json b/wms/customers/gfs/products/surface/pressure.json
@@ -1,7 +1,7 @@
 {
     "title" : "GFS Pressure MSL",
     "abstract" : "MSL Pressure from GFS",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "views": [{
         "layers": [{
             "qid": "l",
@@ -14,4 +14,4 @@
             }
         }]
     }]
-}
+}
diff --git a/wms/customers/gfs/products/surface/relativehumidity.json b/wms/customers/gfs/products/surface/relativehumidity.json
@@ -1,7 +1,7 @@
 {
     "title" : "GFS Relative Humidity 2m",
     "abstract" : "Relative Humidity 2m from GFS",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "keyword": ["model:gfs"],
     "views": [{
         "layers": [{

diff --git a/wms/customers/gfs/products/surface/temperature.json b/wms/customers/gfs/products/surface/temperature.json
@@ -1,7 +1,7 @@
 {
     "title": "GFS Temperature 2m",
     "abstract": "Temperature 2m from GFS",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "views": [
         {
             "layers": [
@@ -18,4 +18,4 @@
             ]
         }
     ]
-}
+}
diff --git a/wms/customers/gfs/products/surface/winddirection.json b/wms/customers/gfs/products/surface/winddirection.json
@@ -1,7 +1,7 @@
 {
     "title": "GFS Wind Direction 10m",
     "abstract": "Wind direction from GFS forecast model.",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "views": [
         {
             "layers": [
@@ -20,4 +20,4 @@
             ]
         }
     ]
-}
+}
diff --git a/wms/customers/gfs/products/surface/windspeed.json b/wms/customers/gfs/products/surface/windspeed.json
@@ -1,7 +1,7 @@
 {
     "title" : "GFS Wind Speed 10m",
     "abstract" : "Wind speed in m/s from HIRLAM forecast GFS.",
-    "producer": "gfs_world_surface",
+    "producer": "gfs_surface",
     "views": [{
         "layers": [{
             "qid": "l",
@@ -13,4 +13,4 @@
             }
         }]
     }]
-}
+}