Merge pull request #140 from HSLdevcom/develop

Develop

Author: ahjyrkia

.github/workflows/scripts/build_and_push_image.sh

@@ -50,10 +50,10 @@ docker run --rm -p 8080:8080 --env DOWNLOAD_RETRY_COUNT=1 \
 -h hsl-map-server --name hsl-map-server $DOCKER_IMAGE &
 sleep 90
 
-test http://localhost:8080/map/v2/hsl-map/14/9326/4739.png 50000
-test http://localhost:8080/map/v2/hsl-map-sv/14/9326/4739.png 50000
-test http://localhost:8080/map/v2/hsl-map-fi-sv/14/9326/4739.png 50000
-test http://localhost:8080/map/v2/hsl-vector-map/14/9326/4739.pbf 10000
+test http://localhost:8080/map/v3/hsl-map/14/9326/4739.png 50000
+test http://localhost:8080/map/v3/hsl-map-sv/14/9326/4739.png 50000
+test http://localhost:8080/map/v3/hsl-map-fi-sv/14/9326/4739.png 50000
+test http://localhost:8080/map/v3/hsl-vector-map/14/9326/4739.pbf 10000
 
 echo Stopping $DOCKER_IMAGE
 docker stop hsl-map-server

Dockerfile

@@ -35,7 +35,6 @@ RUN wget https://hslstoragekarttatuotanto.blob.core.windows.net/openmaptiles/til
 EXPOSE 8080
 
 CMD \
-  yarn run data-fetcher && \
   (Xorg -dpi 96 -nolisten tcp -noreset +extension GLX +extension RANDR +extension RENDER -logfile ./10.log -config ./xorg.conf :10 & \
   DISPLAY=":10" yarn forever start --spinSleepTime 60000 --minUptime 30000 -c "node ${NODE_OPTS}" \
     node_modules/tessera/bin/tessera.js --port 8080 --config config.js --multiprocess \