From 425b1ee8fa383aea3415656815dd080bbbe534a7 Mon Sep 17 00:00:00 2001 From: jared Date: Tue, 24 Jun 2025 17:20:25 +0200 Subject: [PATCH 1/8] =?UTF-8?q?Jenkins=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkins | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 Jenkins diff --git a/Jenkins b/Jenkins new file mode 100644 index 0000000..b982250 --- /dev/null +++ b/Jenkins @@ -0,0 +1,21 @@ +pipeline { + agent any + + stages { + stage('Build') { + steps { + echo 'Building..' + } + } + stage('Test') { + steps { + echo 'Testing..' + } + } + stage('Deploy') { + steps { + echo 'Deploying....' + } + } + } +} From aeccb684b47a957cda5845d41175b0e99bfe72c0 Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 25 Jun 2025 09:11:37 +0200 Subject: [PATCH 2/8] Jenkinsfile aktualisiert rename file --- Jenkins => Jenkinsfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Jenkins => Jenkinsfile (100%) diff --git a/Jenkins b/Jenkinsfile similarity index 100% rename from Jenkins rename to Jenkinsfile From 78bf7c7dbcb152cb6da0ff77b9ea8b2279a3598e Mon Sep 17 00:00:00 2001 From: jared Date: Wed, 25 Jun 2025 09:29:34 +0200 Subject: [PATCH 3/8] =?UTF-8?q?Jenkinsfile=20gel=C3=B6scht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index b982250..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,21 +0,0 @@ -pipeline { - agent any - - stages { - stage('Build') { - steps { - echo 'Building..' - } - } - stage('Test') { - steps { - echo 'Testing..' - } - } - stage('Deploy') { - steps { - echo 'Deploying....' - } - } - } -} From a71807c63ab69b8a8501aec0770fb509a8d22066 Mon Sep 17 00:00:00 2001 From: titver968 Date: Wed, 25 Jun 2025 12:26:18 +0200 Subject: [PATCH 4/8] Dockerfile end config.json for prod and dev --- Dockerfile.dev | 18 ++++++++++++++++++ Dockerfile => Dockerfile.prod | 1 + config.json | 6 +++--- config.json_dev | 17 +++++++++++++++++ config.json_prod | 17 +++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) create mode 100644 Dockerfile.dev rename Dockerfile => Dockerfile.prod (91%) create mode 100644 config.json_dev create mode 100644 config.json_prod diff --git a/Dockerfile.dev b/Dockerfile.dev new file mode 100644 index 0000000..fa8661d --- /dev/null +++ b/Dockerfile.dev @@ -0,0 +1,18 @@ +# --- Build stage --- +FROM node:22 AS build +ENV NODE_ENV=production +ENV ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de +WORKDIR /app +COPY package*.json ./ +RUN npm ci +COPY . ./ +COPY config.json_dev ./config.json +RUN npm run build + +# --- Production stage --- +FROM node:22-alpine3.20 +COPY --from=build /app . +ENV HOST=0.0.0.0 +EXPOSE 3000 +CMD ["sh", "-c", "ORIGIN=https://tatort-dev.innovation-hub-niedersachsen.de node build/index.js"] + diff --git a/Dockerfile b/Dockerfile.prod similarity index 91% rename from Dockerfile rename to Dockerfile.prod index 50a19b5..ac8f049 100644 --- a/Dockerfile +++ b/Dockerfile.prod @@ -6,6 +6,7 @@ WORKDIR /app COPY package*.json ./ RUN npm ci COPY . ./ +COPY config.json_prod ./config.json RUN npm run build # --- Production stage --- diff --git a/config.json b/config.json index 970af4c..75deca9 100644 --- a/config.json +++ b/config.json @@ -1,10 +1,10 @@ { "minio": { - "endPoint": "api-s3.innovation-hub-niedersachsen.de", + "endPoint": "sws3.innovation-hub-niedersachsen.de", "port": 443, "useSSL": true, - "accessKey": "GxKhfnfkNvlDU7qzsz0D", - "secretKey": "cqSM5rIRr4MPtqzu2sNKgmB9k2OghPbyxwAWogeM" + "accessKey": "wjpKrmaqXra99rX3D61H", + "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u" }, "jwt": { "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", diff --git a/config.json_dev b/config.json_dev new file mode 100644 index 0000000..75deca9 --- /dev/null +++ b/config.json_dev @@ -0,0 +1,17 @@ +{ + "minio": { + "endPoint": "sws3.innovation-hub-niedersachsen.de", + "port": 443, + "useSSL": true, + "accessKey": "wjpKrmaqXra99rX3D61H", + "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u" + }, + "jwt": { + "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", + "expiresIn": 3600 + }, + "auth": { + "admin": { "password": "A-InnoHUB_2025!", "admin": true }, + "user": { "password": "U-InnoHUB_2025!", "admin": false } + } +} diff --git a/config.json_prod b/config.json_prod new file mode 100644 index 0000000..970af4c --- /dev/null +++ b/config.json_prod @@ -0,0 +1,17 @@ +{ + "minio": { + "endPoint": "api-s3.innovation-hub-niedersachsen.de", + "port": 443, + "useSSL": true, + "accessKey": "GxKhfnfkNvlDU7qzsz0D", + "secretKey": "cqSM5rIRr4MPtqzu2sNKgmB9k2OghPbyxwAWogeM" + }, + "jwt": { + "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", + "expiresIn": 3600 + }, + "auth": { + "admin": { "password": "A-InnoHUB_2025!", "admin": true }, + "user": { "password": "U-InnoHUB_2025!", "admin": false } + } +} From 8b6d35b66feb7211a0b55e69f305b6445eed7963 Mon Sep 17 00:00:00 2001 From: Chi Cong Tran Date: Tue, 25 Nov 2025 11:44:32 +0100 Subject: [PATCH 5/8] remove old configs --- config.json_dev | 17 ----------------- config.json_prod | 17 ----------------- 2 files changed, 34 deletions(-) delete mode 100644 config.json_dev delete mode 100644 config.json_prod diff --git a/config.json_dev b/config.json_dev deleted file mode 100644 index 75deca9..0000000 --- a/config.json_dev +++ /dev/null @@ -1,17 +0,0 @@ -{ - "minio": { - "endPoint": "sws3.innovation-hub-niedersachsen.de", - "port": 443, - "useSSL": true, - "accessKey": "wjpKrmaqXra99rX3D61H", - "secretKey": "fTPi0u0FR6Lv9Y9IKydWv6WM0EA5XrsK008HCt9u" - }, - "jwt": { - "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", - "expiresIn": 3600 - }, - "auth": { - "admin": { "password": "A-InnoHUB_2025!", "admin": true }, - "user": { "password": "U-InnoHUB_2025!", "admin": false } - } -} diff --git a/config.json_prod b/config.json_prod deleted file mode 100644 index 970af4c..0000000 --- a/config.json_prod +++ /dev/null @@ -1,17 +0,0 @@ -{ - "minio": { - "endPoint": "api-s3.innovation-hub-niedersachsen.de", - "port": 443, - "useSSL": true, - "accessKey": "GxKhfnfkNvlDU7qzsz0D", - "secretKey": "cqSM5rIRr4MPtqzu2sNKgmB9k2OghPbyxwAWogeM" - }, - "jwt": { - "secret": "@S2!q@@wXz$dCQ8JoVsHLpzaJ6JCfB", - "expiresIn": 3600 - }, - "auth": { - "admin": { "password": "A-InnoHUB_2025!", "admin": true }, - "user": { "password": "U-InnoHUB_2025!", "admin": false } - } -} From 646ff668f7f0fc2b3a54dc5a4bbd0879997514dd Mon Sep 17 00:00:00 2001 From: titver968 Date: Tue, 2 Dec 2025 14:23:12 +0100 Subject: [PATCH 6/8] Dockerfile.prod und tailwind.config.cjs --- Dockerfile.prod | 10 ++++++---- tailwind.config.js => tailwind.config.cjs | 0 2 files changed, 6 insertions(+), 4 deletions(-) rename tailwind.config.js => tailwind.config.cjs (100%) diff --git a/Dockerfile.prod b/Dockerfile.prod index 66a3f39..6cb7370 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -1,7 +1,5 @@ # --- Build stage --- FROM node:22 AS build -ENV NODE_ENV=production -ENV ORIGIN=https://tatort.innovation-hub-niedersachsen.de WORKDIR /app COPY package*.json ./ RUN npm ci @@ -11,7 +9,11 @@ RUN npm run build # --- Production stage --- FROM node:22-alpine3.20 -COPY --from=build /app . +ENV NODE_ENV=production +ENV ORIGIN=https://tatort.innovation-hub-niedersachsen.de +COPY --from=build /app/build ./build +COPY --from=build /app/package*.json ./ +RUN npm ci --omit=dev ENV HOST=0.0.0.0 EXPOSE 3000 -CMD ["sh", "-c", "ORIGIN=https://tatort.innovation-hub-niedersachsen.de node build/index.js"] +CMD ["node", "build/index.js"] diff --git a/tailwind.config.js b/tailwind.config.cjs similarity index 100% rename from tailwind.config.js rename to tailwind.config.cjs From ba21f797de8ee4ef4696a72fa112c08c40635ca5 Mon Sep 17 00:00:00 2001 From: titver968 Date: Tue, 2 Dec 2025 14:36:02 +0100 Subject: [PATCH 7/8] src/lib/config.ts -> config.json --- src/lib/config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/config.ts b/src/lib/config.ts index 2e2bf34..0775514 100644 --- a/src/lib/config.ts +++ b/src/lib/config.ts @@ -1,3 +1,3 @@ import { readFileSync } from 'fs'; -export default JSON.parse(readFileSync('./config_prod.json').toString()); +export default JSON.parse(readFileSync('./config.json').toString()); From e2cd6945f5e995c75c92d34de0a3525629fb4888 Mon Sep 17 00:00:00 2001 From: titver968 Date: Tue, 2 Dec 2025 14:44:35 +0100 Subject: [PATCH 8/8] Dockerfile.prod --- Dockerfile.prod | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile.prod b/Dockerfile.prod index 6cb7370..961a8ae 100644 --- a/Dockerfile.prod +++ b/Dockerfile.prod @@ -9,10 +9,12 @@ RUN npm run build # --- Production stage --- FROM node:22-alpine3.20 +WORKDIR /app ENV NODE_ENV=production ENV ORIGIN=https://tatort.innovation-hub-niedersachsen.de COPY --from=build /app/build ./build COPY --from=build /app/package*.json ./ +COPY --from=build /app/config.json ./config.json RUN npm ci --omit=dev ENV HOST=0.0.0.0 EXPOSE 3000