Workflow funktioniert nun wieder. Es gab Probleme nach Aenderungen.
Build and Publish Site / docker (push) Successful in 23s
Build and Publish Site / docker (push) Successful in 23s
ABER: Die Applikation funktioniert nur lokal. Die deployte Version geht noch nicht.
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
version: '3.8'
|
||||
|
||||
services:
|
||||
logic-red:
|
||||
build: ./logic
|
||||
|
||||
@@ -0,0 +1,14 @@
|
||||
# Node.js Abhängigkeiten, werden im Dockerfile installiert
|
||||
node_modules
|
||||
|
||||
# Laufzeitdaten und Logs
|
||||
logs
|
||||
results
|
||||
|
||||
# Eingabedaten und temporäre Dateien
|
||||
archivegroup_information.json
|
||||
non_specified_groups.csv
|
||||
|
||||
# Backups
|
||||
*.backup
|
||||
.DS_Store
|
||||
+31
-16
@@ -4,38 +4,53 @@
|
||||
FROM nodered/node-red:latest AS builder
|
||||
USER root
|
||||
|
||||
# Compiler installieren, die Scout bemängelt
|
||||
RUN apk add --no-cache python3 py3-pip python3-dev gcc g++ musl-dev libffi-dev
|
||||
# Compiler installieren
|
||||
RUN apk add --no-cache \
|
||||
python3 \
|
||||
py3-pip \
|
||||
python3-dev \
|
||||
gcc \
|
||||
g++ \
|
||||
musl-dev \
|
||||
libffi-dev
|
||||
|
||||
# Python-Pakete in einen separaten Ordner installieren
|
||||
RUN pip3 install --no-cache-dir --break-system-packages --target=/opt/python-packages \
|
||||
RUN pip3 install --no-cache-dir --break-system-packages \
|
||||
--target=/opt/python-packages \
|
||||
pandas \
|
||||
numpy \
|
||||
ldap3
|
||||
|
||||
# ================================================
|
||||
# STAGE 2: Das finale, saubere Image
|
||||
# gcc, ... wird nicht in das finale Image kopiert.
|
||||
# ================================================
|
||||
FROM nodered/node-red:latest
|
||||
USER root
|
||||
|
||||
# NUR die Laufzeitumgebung installieren (KEIN gcc, KEIN g++, KEIN musl-dev!)
|
||||
RUN apk add --no-cache python3 py3-pip tzdata
|
||||
# Nur Laufzeitumgebung installieren
|
||||
RUN apk add --no-cache \
|
||||
python3 \
|
||||
py3-pip \
|
||||
tzdata
|
||||
|
||||
# Die fertig kompilierten Pakete aus Stage 1 an einen stabilen Ort kopieren
|
||||
# Python-Pakete aus der Builder-Stage übernehmen
|
||||
COPY --from=builder /opt/python-packages /opt/python-packages
|
||||
|
||||
# Den neuen Paket-Ordner zum PYTHONPATH hinzufügen
|
||||
# Python-Pfad erweitern
|
||||
ENV PYTHONPATH="/opt/python-packages"
|
||||
|
||||
# Für globale npm-Installationen im Container bleiben wir kurz root,
|
||||
# übergeben aber das Node-RED-Verzeichnis als Zielpfad
|
||||
WORKDIR /usr/src/node-red
|
||||
RUN npm install --no-update-notifier \
|
||||
node-red-contrib-moment \
|
||||
node-red-contrib-cron-plus \
|
||||
passport-ldapauth
|
||||
# Node-RED-Daten kopieren
|
||||
COPY node-red-data/ /data/
|
||||
|
||||
# Zurück zum sicheren Standard-User von Node-RED für den laufenden Betrieb
|
||||
# Eigene Skripte kopieren
|
||||
COPY scripts/ /data/scripts/
|
||||
|
||||
# Startscript kopieren und ausführbar machen
|
||||
COPY start.sh /usr/local/bin/start.sh
|
||||
RUN chmod +x /usr/local/bin/start.sh
|
||||
|
||||
# Zurück zum sicheren Standard-User
|
||||
USER node-red
|
||||
|
||||
# Eigenes Startscript verwenden
|
||||
ENTRYPOINT ["/usr/local/bin/start.sh"]
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"node-red": {
|
||||
"name": "node-red",
|
||||
"version": "5.0.0",
|
||||
"version": "5.0.1",
|
||||
"local": false,
|
||||
"user": false,
|
||||
"nodes": {
|
||||
@@ -427,41 +427,11 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node-red-contrib-moment": {
|
||||
"name": "node-red-contrib-moment",
|
||||
"version": "5.0.0",
|
||||
"local": false,
|
||||
"user": false,
|
||||
"nodes": {
|
||||
"moment": {
|
||||
"name": "moment",
|
||||
"types": [
|
||||
"moment"
|
||||
],
|
||||
"enabled": true,
|
||||
"local": false,
|
||||
"user": false,
|
||||
"module": "node-red-contrib-moment",
|
||||
"file": "/usr/src/node-red/node_modules/node-red-contrib-moment/moment/nrmoment.js"
|
||||
},
|
||||
"humanizer": {
|
||||
"name": "humanizer",
|
||||
"types": [
|
||||
"humanizer"
|
||||
],
|
||||
"enabled": true,
|
||||
"local": false,
|
||||
"user": false,
|
||||
"module": "node-red-contrib-moment",
|
||||
"file": "/usr/src/node-red/node_modules/node-red-contrib-moment/moment/nrhumanizer.js"
|
||||
}
|
||||
}
|
||||
},
|
||||
"node-red-contrib-cron-plus": {
|
||||
"name": "node-red-contrib-cron-plus",
|
||||
"version": "2.2.4",
|
||||
"local": false,
|
||||
"user": false,
|
||||
"local": true,
|
||||
"user": true,
|
||||
"nodes": {
|
||||
"cronplus": {
|
||||
"name": "cronplus",
|
||||
@@ -469,10 +439,40 @@
|
||||
"cronplus"
|
||||
],
|
||||
"enabled": true,
|
||||
"local": false,
|
||||
"local": true,
|
||||
"user": false,
|
||||
"module": "node-red-contrib-cron-plus",
|
||||
"file": "/usr/src/node-red/node_modules/node-red-contrib-cron-plus/cronplus.js"
|
||||
"file": "/data/node_modules/node-red-contrib-cron-plus/cronplus.js"
|
||||
}
|
||||
}
|
||||
},
|
||||
"node-red-contrib-moment": {
|
||||
"name": "node-red-contrib-moment",
|
||||
"version": "5.0.0",
|
||||
"local": true,
|
||||
"user": true,
|
||||
"nodes": {
|
||||
"moment": {
|
||||
"name": "moment",
|
||||
"types": [
|
||||
"moment"
|
||||
],
|
||||
"enabled": true,
|
||||
"local": true,
|
||||
"user": false,
|
||||
"module": "node-red-contrib-moment",
|
||||
"file": "/data/node_modules/node-red-contrib-moment/moment/nrmoment.js"
|
||||
},
|
||||
"humanizer": {
|
||||
"name": "humanizer",
|
||||
"types": [
|
||||
"humanizer"
|
||||
],
|
||||
"enabled": true,
|
||||
"local": true,
|
||||
"user": false,
|
||||
"module": "node-red-contrib-moment",
|
||||
"file": "/data/node_modules/node-red-contrib-moment/moment/nrhumanizer.js"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
@@ -0,0 +1 @@
|
||||
{"_id":"coord-parser","_rev":"3-774515f83977b2428ae528647e4cfe32","name":"coord-parser","description":"Loose geographic coordinate parsing library (designed for user input)","dist-tags":{"latest":"1.0.0"},"versions":{"1.0.0":{"name":"coord-parser","version":"1.0.0","description":"Loose geographic coordinate parsing library (designed for user input)","main":"index.js","scripts":{"test":"mocha -R tap"},"repository":{"type":"git","url":"git+https://github.com/gmaclennan/coord-parser.git"},"author":{"name":"Brian Reavis","email":"brian@naturalatlas.com"},"license":"MIT","bugs":{"url":"https://github.com/naturalatlas/coord-parser/issues"},"homepage":"https://github.com/naturalatlas/coord-parser","devDependencies":{"chai":"^3.4.1","mocha":"^2.3.4"},"gitHead":"f46fe359875aa6317e7752e35569acdcd0056d42","_id":"coord-parser@1.0.0","_shasum":"eadbcf192cb2b1c339ee7802fb14834769490242","_from":".","_npmVersion":"2.14.8","_nodeVersion":"4.2.1","_npmUser":{"name":"brianreavis","email":"brian@thirdroute.com"},"dist":{"shasum":"eadbcf192cb2b1c339ee7802fb14834769490242","tarball":"https://registry.npmjs.org/coord-parser/-/coord-parser-1.0.0.tgz","integrity":"sha512-rketzalr6NS1IE8QjVf90djYvfxQ97aL3onUj8VlJsGsEBbsKf6SoKK3awYTrqynLr9VEBbCkHrwayGU4XjU2Q==","signatures":[{"keyid":"SHA256:jl3bwswu80PjjokCgh0o2w5c2U4LhQAE57gj9cz1kzA","sig":"MEUCIQCoSQkG4kbFHHTRsBm0yvcbaq9LOXK9YU5gyXoSSWnpigIgGSCHZfUUIno7q38ZmLAwPSG4c34yZSlOgig9QwCVtGk="}]},"maintainers":[{"name":"brianreavis","email":"brian@thirdroute.com"}]}},"readme":"# coord-parser\n[](https://www.npmjs.org/package/coord-parser)\n[](https://travis-ci.org/naturalatlas/coord-parser)\n[](https://codecov.io/github/naturalatlas/coord-parser)\n\n`coord-parser` is a DMS coordinate parsing library designed to handle very rough / mangled user input. It's a re-write of Gregor MacLennan's [`parse-dms`](https://github.com/gmaclennan/parse-dms). If you notice something it can't parse, open an issue or pull request.\n\n```sh\n$ npm install coord-parser --save\n```\n\n### Usage\n\n```js\nvar parse = require('coord-parser');\n\nparse('59°12\\'7.7“N 02°15\\'39.6“W');\nparse('N59°12\\'7.7\" W02°15\\'39.6\"');\nparse('-2.1S-1.1E');\nparse('2N,1');\n```\n\n## Contributing\n\nBefore submitting pull requests, please update the [tests](test) and make sure they all pass.\n\n```sh\n$ npm test\n```\n\n## License\n\nThe MIT License (MIT)\n\nCopyright © 2015 Natural Atlas, Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy of\nthis software and associated documentation files (the \"Software\"), to deal in\nthe Software without restriction, including without limitation the rights to\nuse, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of\nthe Software, and to permit persons to whom the Software is furnished to do so,\nsubject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS\nFOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR\nCOPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER\nIN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN\nCONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n","maintainers":[{"name":"brianreavis","email":"brian@thirdroute.com"}],"time":{"modified":"2022-06-13T23:11:12.143Z","created":"2015-11-23T21:59:46.503Z","1.0.0":"2015-11-23T21:59:46.503Z"},"homepage":"https://github.com/naturalatlas/coord-parser","repository":{"type":"git","url":"git+https://github.com/gmaclennan/coord-parser.git"},"author":{"name":"Brian Reavis","email":"brian@naturalatlas.com"},"bugs":{"url":"https://github.com/naturalatlas/coord-parser/issues"},"license":"MIT","readmeFilename":"README.md"}
|
||||
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+1
File diff suppressed because one or more lines are too long
+1
File diff suppressed because one or more lines are too long
BIN
Binary file not shown.
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
a479bdf890b5e6bf45b4597f669a01d1a6fd063e {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/ldap-filter","integrity":"sha512-fpyZQnNq59PJetBeryh9q0GbjNy4/436WzFM9N0OHSAs4hAnRvsXgEb+UFM1EoXElHIRmFwwjwSa+J4PqJgwCA==","time":1783070353144,"size":17760,"metadata":{"time":1783070353134,"url":"https://registry.npmjs.org/ldap-filter","reqHeaders":{"accept":"application/json"},"resHeaders":{"cache-control":"public, max-age=300","content-encoding":"gzip","content-type":"application/json","date":"Fri, 03 Jul 2026 09:19:13 GMT","etag":"W/\"7e25b0137dd5c9fc5620d70afca2d756\"","last-modified":"Sun, 19 Jun 2022 11:05:17 GMT","vary":"accept-encoding, accept"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
80ee360e29ee1ef1489865fb1c9ea812ac911015 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@ldapjs%2fasn1","integrity":"sha512-8MFih3LPvH3EdK4iwGKjm48dkXy2KZ0EMfTwHF+ePzskNmIwS75wowrRDKanDZAYDhO+5kq1pFVCoCjvfoqSFA==","time":1783070352053,"size":46575,"metadata":{"time":1783070352033,"url":"https://registry.npmjs.org/@ldapjs%2fasn1","reqHeaders":{"accept":"application/json"},"resHeaders":{"cache-control":"public, max-age=300","content-encoding":"gzip","content-type":"application/json","date":"Fri, 03 Jul 2026 09:19:12 GMT","etag":"W/\"05686c93e1151688de8a58a0631da93d\"","last-modified":"Tue, 14 May 2024 22:17:55 GMT","vary":"accept-encoding, accept"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
1776ddee68a4cca036ca579f08af57587bf2f3b9 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/node-red-contrib-moment/-/node-red-contrib-moment-5.0.0.tgz","integrity":"sha512-Tp8fzCfm6ST6Aazb50ZCkecMLK5MAU+Gj/AuTiWFrL6W5r04AjmJyta0ms3/4kC5dEw6chWN6EUjrZmJ228doA==","time":1783070354394,"size":355170,"metadata":{"time":1783070353605,"url":"https://registry.npmjs.org/node-red-contrib-moment/-/node-red-contrib-moment-5.0.0.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, immutable, max-age=31557600","content-type":"application/octet-stream","date":"Fri, 03 Jul 2026 09:19:13 GMT","etag":"\"911091d94f70d19c2866ca006ce94dbe\"","last-modified":"Sun, 16 Jul 2023 17:47:49 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
35694831fe57d3e3c415f8894d2409fa63f49ef0 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@ldapjs%2ffilter","integrity":"sha512-1CSAVXXaffrczziiTKiLtjkxqwjpnbyyK6+dQ76k5xjE4ORtWKKpv0+k/SQ/aQrmKaTQ041XgEx4a16ScWZt7A==","time":1783070352061,"size":58282,"metadata":{"time":1783070352037,"url":"https://registry.npmjs.org/@ldapjs%2ffilter","reqHeaders":{"accept":"application/json"},"resHeaders":{"cache-control":"public, max-age=300","content-encoding":"gzip","content-type":"application/json","date":"Fri, 03 Jul 2026 09:19:12 GMT","etag":"W/\"1323d20f882e9732d134de8e0f9952e7\"","last-modified":"Tue, 14 May 2024 22:18:50 GMT","vary":"accept-encoding, accept"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
f7fa4a0f5be233dc151f3b6b37cfab903105862d {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/@ldapjs/change/-/change-1.0.0.tgz","integrity":"sha512-EOQNFH1RIku3M1s0OAJOzGfAohuFYXFY4s73wOhRm4KFGhmQQ7MChOh2YtYu9Kwgvuq1B0xKciXVzHCGkB5V+Q==","time":1783070353960,"size":5608,"metadata":{"time":1783070353756,"url":"https://registry.npmjs.org/@ldapjs/change/-/change-1.0.0.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, must-revalidate, max-age=31557600","content-type":"application/octet-stream","date":"Fri, 03 Jul 2026 09:19:13 GMT","etag":"\"96cf339919bd0019d0caed62d7f38188\"","last-modified":"Wed, 22 Feb 2023 17:08:21 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
9e92867a534f91ec3516128ce74f74447c977842 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/cronstrue","integrity":"sha512-TlXy9qs++AGjfxcfrG6KMF6xg026K3foG0vRP4R9LqnRxNdZKKAx1xaDdmZJpXkdzcOsF53ejSxaILyOc0qI5w==","time":1783070352164,"size":635413,"metadata":{"time":1783070352110,"url":"https://registry.npmjs.org/cronstrue","reqHeaders":{"accept":"application/json"},"resHeaders":{"cache-control":"public, max-age=300","content-encoding":"gzip","content-type":"application/json","date":"Fri, 03 Jul 2026 09:19:12 GMT","etag":"W/\"892a0060d214e32d9acf93e2efdbde64\"","last-modified":"Mon, 29 Jun 2026 23:36:24 GMT","vary":"accept-encoding, accept"},"options":{"compress":true}}}
|
||||
+2
@@ -0,0 +1,2 @@
|
||||
|
||||
93c2adba75161281e9755f6050b1290089e40297 {"key":"make-fetch-happen:request-cache:https://registry.npmjs.org/moment/-/moment-2.30.1.tgz","integrity":"sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==","time":1783070355267,"size":715526,"metadata":{"time":1783070353527,"url":"https://registry.npmjs.org/moment/-/moment-2.30.1.tgz","reqHeaders":{},"resHeaders":{"cache-control":"public, immutable, max-age=31557600","content-type":"application/octet-stream","date":"Fri, 03 Jul 2026 09:19:13 GMT","etag":"\"5aea59798395ace1e0ef3d7715eee941\"","last-modified":"Wed, 27 Dec 2023 10:38:45 GMT","vary":"Accept-Encoding"},"options":{"compress":true}}}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user