From ae9c9e2f4ca8857229f776d28367d239c7488d19 Mon Sep 17 00:00:00 2001 From: bmaz Date: Tue, 23 Jul 2024 11:57:49 +0200 Subject: [PATCH] Bump 0.1.9 --- Dockerfile | 3 +- docker-entrypoint.sh | 2 +- .../prod/sciencespo/kustomization.yml | 2 +- package-lock.json | 51 +++++++++++++++++++ package.json | 2 +- src/build.js | 2 +- 6 files changed, 56 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index c7cfdfb..bb48466 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,8 +6,7 @@ RUN mkdir /resin-backend RUN apk update && \ apk add nodejs=~20 npm=~10 && \ - apk add bash && \ - apk add at + apk add bash ENV BACKEND_PORT=8000 ENV BACKEND_HOST=django diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index c1f2c15..39f6367 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -3,6 +3,6 @@ export NS=$(cat /etc/resolv.conf | grep nameserver | awk -F " " '{print $2}') envsubst '\$NS \$BACKEND_HOST \$BACKEND_PORT' < /etc/nginx/nginx.conf.template > /etc/nginx/nginx.conf -echo "sleep 5 ; npm run build" | at now +echo "sleep 5 ; npm run build" | bash & nginx -g "daemon off;" diff --git a/k8s/overlays/prod/sciencespo/kustomization.yml b/k8s/overlays/prod/sciencespo/kustomization.yml index 5901e8d..8624488 100644 --- a/k8s/overlays/prod/sciencespo/kustomization.yml +++ b/k8s/overlays/prod/sciencespo/kustomization.yml @@ -23,4 +23,4 @@ images: - name: scpomedialab/resin-annuaire-backend newTag: "0.2.0" - name: scpomedialab/resin-annuaire - newTag: "0.1.8" + newTag: "0.1.9" diff --git a/package-lock.json b/package-lock.json index 8c3fe4e..427d3a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "0.0.1", "license": "AGPL-3.0", "dependencies": { + "@adobe/node-fetch-retry": "^2.2.0", "@medialab/resin-formulaire": "github:medialab/resin-formulaire", "concurrently": "^8.2.2", "csvtojson": "^2.0.10", @@ -30,6 +31,15 @@ "unidecode": "^0.1.8" } }, + "node_modules/@adobe/node-fetch-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@adobe/node-fetch-retry/-/node-fetch-retry-2.2.0.tgz", + "integrity": "sha512-4sNIVGL26G2vzFA+O/CC2Y5dBG6P7QCTuNr/3pRpo1vJUlPt6aiyhlE/wPYR7WF/MSK+y6hkqqjnRMk5/Myfhg==", + "dependencies": { + "abort-controller": "^3.0.0", + "node-fetch": "^2.6.7" + } + }, "node_modules/@ampproject/remapping": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", @@ -2174,6 +2184,17 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "node_modules/abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "dependencies": { + "event-target-shim": "^5.0.0" + }, + "engines": { + "node": ">=6.5" + } + }, "node_modules/accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -3216,6 +3237,14 @@ "node": ">= 0.6" } }, + "node_modules/event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", + "engines": { + "node": ">=6" + } + }, "node_modules/eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", @@ -6308,6 +6337,15 @@ } }, "dependencies": { + "@adobe/node-fetch-retry": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/@adobe/node-fetch-retry/-/node-fetch-retry-2.2.0.tgz", + "integrity": "sha512-4sNIVGL26G2vzFA+O/CC2Y5dBG6P7QCTuNr/3pRpo1vJUlPt6aiyhlE/wPYR7WF/MSK+y6hkqqjnRMk5/Myfhg==", + "requires": { + "abort-controller": "^3.0.0", + "node-fetch": "^2.6.7" + } + }, "@ampproject/remapping": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.2.1.tgz", @@ -7831,6 +7869,14 @@ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==" }, + "abort-controller": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", + "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", + "requires": { + "event-target-shim": "^5.0.0" + } + }, "accepts": { "version": "1.3.8", "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", @@ -8547,6 +8593,11 @@ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==" }, + "event-target-shim": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", + "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==" + }, "eventemitter3": { "version": "4.0.7", "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", diff --git a/package.json b/package.json index e16c072..039028c 100644 --- a/package.json +++ b/package.json @@ -24,6 +24,7 @@ }, "homepage": "https://github.com/medialab/resin-annuaire#readme", "dependencies": { + "@adobe/node-fetch-retry": "^2.2.0", "@medialab/resin-formulaire": "github:medialab/resin-formulaire", "concurrently": "^8.2.2", "csvtojson": "^2.0.10", @@ -34,7 +35,6 @@ "lodash": "^4.17.21", "mime": "^3.0.0", "mocha": "^10.2.0", - "node-fetch": "^2.7.0", "nodemon": "^3.0.2", "nunjucks": "^3.2.4", "pandemonium": "^2.4.1", diff --git a/src/build.js b/src/build.js index 085a06b..5b8b20d 100644 --- a/src/build.js +++ b/src/build.js @@ -3,7 +3,7 @@ const fs = require("fs-extra"); const yaml = require("js-yaml"); const csv = require("csvtojson"); const kotatsu = require("kotatsu"); -const fetch = require("node-fetch"); +const fetch = require("@adobe/node-fetch-retry"); const nunjucks = require("nunjucks"); const { sortBy } = require("lodash"); const { promisify } = require("util");