From 21a194f03955ff912ea68e5920e4d44f6b83b764 Mon Sep 17 00:00:00 2001 From: Frank Elsinga Date: Mon, 13 Nov 2023 22:48:56 +0100 Subject: [PATCH 1/2] removed a debug statement --- webclient/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webclient/Dockerfile b/webclient/Dockerfile index cba485f38..aa5d40465 100644 --- a/webclient/Dockerfile +++ b/webclient/Dockerfile @@ -25,4 +25,4 @@ COPY --from=build-stage /dist /app EXPOSE 3000 HEALTHCHECK CMD curl --fail localhost:3000/health || exit 1 -CMD sh -c "sed -i 's|TILESERVER_URL|${TILESERVER_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CDN_URL|${CDN_URL}|g' /etc/nginx/nginx.conf && sed -i 's|MAIN_API_URL|${MAIN_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|FEEDBACK_API_URL|${FEEDBACK_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CALENDAR_API_URL|${CALENDAR_API_URL}|g' /etc/nginx/nginx.conf && cat /etc/nginx/nginx.conf && nginx -g 'daemon off;'" +CMD sh -c "sed -i 's|TILESERVER_URL|${TILESERVER_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CDN_URL|${CDN_URL}|g' /etc/nginx/nginx.conf && sed -i 's|MAIN_API_URL|${MAIN_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|FEEDBACK_API_URL|${FEEDBACK_API_URL}|g' /etc/nginx/nginx.conf && sed -i 's|CALENDAR_API_URL|${CALENDAR_API_URL}|g' /etc/nginx/nginx.conf && nginx -g 'daemon off;'" From 6a316ae9a3671709cb5f61d0428dc15cf403eeab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 23:17:51 +0100 Subject: [PATCH 2/2] Update dependency prettier to v3.1.0 (#882) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- webclient/package.json | 2 +- webclient/pnpm-lock.yaml | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/webclient/package.json b/webclient/package.json index 3a1c6a2f8..d5c48e60e 100644 --- a/webclient/package.json +++ b/webclient/package.json @@ -38,7 +38,7 @@ "eslint-plugin-vue": "9.18.1", "isomorphic-fetch": "3.0.0", "npm-run-all": "4.1.5", - "prettier": "3.0.3", + "prettier": "3.1.0", "sass": "1.69.5", "stylelint-scss": "5.3.1", "typescript": "5.2.2", diff --git a/webclient/pnpm-lock.yaml b/webclient/pnpm-lock.yaml index 0dcea2afb..f88eaa31d 100644 --- a/webclient/pnpm-lock.yaml +++ b/webclient/pnpm-lock.yaml @@ -45,7 +45,7 @@ devDependencies: version: 4.4.1(vite@4.5.0)(vue@3.3.8) '@vue/eslint-config-prettier': specifier: 8.0.0 - version: 8.0.0(eslint@8.53.0)(prettier@3.0.3) + version: 8.0.0(eslint@8.53.0)(prettier@3.1.0) '@vue/eslint-config-typescript': specifier: 12.0.0 version: 12.0.0(eslint-plugin-vue@9.18.1)(eslint@8.53.0)(typescript@5.2.2) @@ -71,8 +71,8 @@ devDependencies: specifier: 4.1.5 version: 4.1.5 prettier: - specifier: 3.0.3 - version: 3.0.3 + specifier: 3.1.0 + version: 3.1.0 sass: specifier: 1.69.5 version: 1.69.5 @@ -1025,7 +1025,7 @@ packages: /@vue/devtools-api@6.5.1: resolution: {integrity: sha512-+KpckaAQyfbvshdDW5xQylLni1asvNSGme1JFs8I1+/H5pHEhqUKMEQD/qn3Nx5+/nycBq11qAEi8lk+LXI2dA==} - /@vue/eslint-config-prettier@8.0.0(eslint@8.53.0)(prettier@3.0.3): + /@vue/eslint-config-prettier@8.0.0(eslint@8.53.0)(prettier@3.1.0): resolution: {integrity: sha512-55dPqtC4PM/yBjhAr+yEw6+7KzzdkBuLmnhBrDfp4I48+wy+Giqqj9yUr5T2uD/BkBROjjmqnLZmXRdOx/VtQg==} peerDependencies: eslint: '>= 8.0.0' @@ -1033,8 +1033,8 @@ packages: dependencies: eslint: 8.53.0 eslint-config-prettier: 8.10.0(eslint@8.53.0) - eslint-plugin-prettier: 5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.0.3) - prettier: 3.0.3 + eslint-plugin-prettier: 5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.1.0) + prettier: 3.1.0 transitivePeerDependencies: - '@types/eslint' dev: true @@ -2202,7 +2202,7 @@ packages: eslint: 8.53.0 dev: true - /eslint-plugin-prettier@5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.0.3): + /eslint-plugin-prettier@5.0.1(eslint-config-prettier@8.10.0)(eslint@8.53.0)(prettier@3.1.0): resolution: {integrity: sha512-m3u5RnR56asrwV/lDC4GHorlW75DsFfmUcjfCYylTUs85dBRnB7VM6xG8eCMJdeDRnppzmxZVf1GEPJvl1JmNg==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: @@ -2218,7 +2218,7 @@ packages: dependencies: eslint: 8.53.0 eslint-config-prettier: 8.10.0(eslint@8.53.0) - prettier: 3.0.3 + prettier: 3.1.0 prettier-linter-helpers: 1.0.0 synckit: 0.8.5 dev: true @@ -4010,8 +4010,8 @@ packages: fast-diff: 1.3.0 dev: true - /prettier@3.0.3: - resolution: {integrity: sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==} + /prettier@3.1.0: + resolution: {integrity: sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==} engines: {node: '>=14'} hasBin: true dev: true