Release 3.28.0

.github/workflows/pull-request-closed.yml

@@ -19,3 +19,9 @@ jobs:
             docker compose down
             cd ..
             rm -r pr-${{ github.event.number }}
+      - name: Delete Docker tag
+        run: |
+          token=$(curl -s -L 'https://hub.docker.com/v2/users/login' -H 'Content-Type: application/json' -d '{ "username": "${{ secrets.DOCKER_USERNAME }}", "password": "${{ secrets.DOCKER_PASSWORD }}"}')
+          token=${token#*\"token\":\"}
+          token=${token%%\"*}
+          curl -s -L -X DELETE "https://hub.docker.com/v2/namespaces/aamdigital/repositories/ndb-server/tags/pr-${{ github.event.number }}" -H "Authorization: Bearer $token"

.github/workflows/tagged-commit.yml

@@ -34,3 +34,10 @@ jobs:
             SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_TOKEN }}
             SENTRY_ORG=${{ secrets.SENTRY_ORG }}
             SENTRY_PROJECT=${{ secrets.SENTRY_PROJECT }}
+      - name: If new release, delete pre-release tags from Docker Hub
+        if: ${{ ! contains(env.TAG, '-master.') }}
+        run: |
+          token=$(curl -s -L 'https://hub.docker.com/v2/users/login' -H 'Content-Type: application/json' -d '{ "username": "${{ secrets.DOCKER_USERNAME }}", "password": "${{ secrets.DOCKER_PASSWORD }}"}')
+          token=${token#*\"token\":\"}
+          token=${token%%\"*}
+          curl -s -L "https://hub.docker.com/v2/namespaces/aamdigital/repositories/ndb-server/tags?page_size=100" -H "Authorization: Bearer $token" | jq '.results[].name | select(test("-master.")?)' | xargs -n1 -I %TAG curl -s -L -X DELETE "https://hub.docker.com/v2/namespaces/aamdigital/repositories/ndb-server/tags/%TAG" -H "Authorization: Bearer $token"

angular.json

@@ -33,7 +33,6 @@
             "styles": [
               "src/styles/styles.scss",
               "src/styles/themes/ndb-theme.scss",
-              "node_modules/flag-icons/css/flag-icons.min.css",
               "node_modules/leaflet/dist/leaflet.css"
             ],
             "stylePreprocessorOptions": {

build/Dockerfile

@@ -77,6 +77,8 @@ COPY --from=builder /app/dist/ /usr/share/nginx/html
 ENV PORT=80
 # The url to the CouchDB database
 ENV COUCHDB_URL="http://localhost"
+# The url to the query backend, see https://github.com/Aam-Digital/query-backend
+ENV QUERY_URL="http://localhost:3000"
 # The url to a nominatim instance, see https://nominatim.org/
 ENV NOMINATIM_URL="https://nominatim.openstreetmap.org"
 
@@ -91,5 +93,5 @@ ENV CSP="default-src 'self' 'unsafe-eval' data: https://*.tile.openstreetmap.org
 ### 'unsafe-eval' required for pouchdb https://github.com/pouchdb/pouchdb/issues/7853#issuecomment-535020600
 
 # variables are inserted into the nginx config
-CMD envsubst '$$PORT $$COUCHDB_URL $$NOMINATIM_URL $$CSP $$CSP_REPORT_URI' < /etc/nginx/templates/default.conf > /etc/nginx/conf.d/default.conf &&\
+CMD envsubst '$$PORT $$COUCHDB_URL $$QUERY_URL $$NOMINATIM_URL $$CSP $$CSP_REPORT_URI' < /etc/nginx/templates/default.conf > /etc/nginx/conf.d/default.conf &&\
     nginx -g 'daemon off;'

build/default.conf

@@ -49,6 +49,18 @@ server {
         proxy_set_header X-Forwarded-Ssl on;
     }
 
+    # The proxy path should be the same as in SqlReportService.QUERY_PROXY
+    location ^~ /query {
+        rewrite /query/(.*) /$1 break;
+        proxy_pass ${QUERY_URL};
+        proxy_redirect off;
+        proxy_buffering off;
+        proxy_set_header Host $host;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Ssl on;
+    }
+
+    # The proxy path should be the same as in GeoService.remoteUrl
     location ^~ /nominatim {
         rewrite /nominatim/(.*) /$1 break;
         proxy_pass ${NOMINATIM_URL};