diff --git a/data/Dockerfile b/data/Dockerfile index b13433518..b0beb3bb8 100644 --- a/data/Dockerfile +++ b/data/Dockerfile @@ -27,7 +27,7 @@ COPY external/results/maps/roomfinder output/maps/roomfinder # compress data (only using gzip, because brotli on ngnix is a royal pain) RUN gzip --force --keep --recursive output/ -FROM nginx:1.26 as production-stage +FROM nginx:1.27 as production-stage RUN mkdir /cdn COPY --from=build-stage /app/output /cdn COPY nginx.conf /etc/nginx/nginx.conf diff --git a/docker-compose.local.yml b/docker-compose.local.yml index 381840855..224f47cee 100644 --- a/docker-compose.local.yml +++ b/docker-compose.local.yml @@ -38,7 +38,7 @@ services: - tileserver-src:/data - ./map/:/map/:ro tileserver-srv-src: # needed for simpler initialisation of dev environments - image: nginx:1.26 + image: nginx:1.27 restart: on-failure volumes: - tileserver-src:/usr/share/nginx/html/maps/vol:ro diff --git a/docker-compose.yml b/docker-compose.yml index b8949d6ea..a7f7b4813 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -46,7 +46,7 @@ services: - tileserver-src:/data - ./map/:/map/:ro tileserver-srv-src: # needed for simpler initialisation of dev environments - image: nginx:1.26 + image: nginx:1.27 restart: unless-stopped labels: - "traefik.enable=true" diff --git a/server/Cargo.lock b/server/Cargo.lock index 31f3b60bc..7e8162cca 100644 --- a/server/Cargo.lock +++ b/server/Cargo.lock @@ -4095,9 +4095,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -4114,9 +4114,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", diff --git a/webclient/package.json b/webclient/package.json index cefbf426e..cda75fc9b 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -48,5 +48,5 @@ "vue-tsc": "1.8.27" }, "type": "module", - "packageManager": "pnpm@9.1.2" + "packageManager": "pnpm@9.1.4" }