From 3bde9cd8d955b99e88a030c782649d5446656344 Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Sat, 26 Sep 2026 21:21:37 +0200 Subject: [PATCH 1/3] #520: updated docker setup --- deployment/docker/Dockerfile | 17 ++++++++--------- deployment/docker/build.sh | 4 +++- deployment/docker/push.sh | 2 ++ example.env | 2 +- package.json | 7 +++++-- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile index 192dc710..0d91c320 100644 --- a/deployment/docker/Dockerfile +++ b/deployment/docker/Dockerfile @@ -1,4 +1,4 @@ -# TimeTrap Docker Image +# Comify Docker Image # Build this image from the project root directory FROM node:24.12-alpine3.22 @@ -7,15 +7,14 @@ FROM node:24.12-alpine3.22 RUN mkdir /opt/app COPY package.json /opt/app/package.json COPY package-lock.json /opt/app/package-lock.json -COPY jitar.json /opt/app/jitar.json -# Init dist -RUN mkdir /opt/app/dist -COPY dist /opt/app/dist +# INIT configs +COPY jitar.json /opt/app/jitar.json +COPY deployment/services/demonstration/social.json /opt/app/service.json -# Init services -RUN mkdir /opt/app/services -COPY services/standalone.json /opt/app/services/standalone.json +# Init dist +RUN mkdir -p /opt/app/dist +COPY artifacts/dist /opt/app/dist WORKDIR /opt/app @@ -23,4 +22,4 @@ RUN npm ci --omit=dev USER node -CMD ["npm", "run", "production"] \ No newline at end of file +CMD ["npm", "run", "containerd"] \ No newline at end of file diff --git a/deployment/docker/build.sh b/deployment/docker/build.sh index 67454aaf..7d03f5f4 100755 --- a/deployment/docker/build.sh +++ b/deployment/docker/build.sh @@ -1,3 +1,5 @@ +# Run me from the project root !! + VERSION=$(jq -r '.version' package.json) -docker build -t "localhost:5000/comify:$VERSION" -f docker/Dockerfile . \ No newline at end of file +docker build -t "localhost:5000/comify:$VERSION" -f deployment/docker/Dockerfile . \ No newline at end of file diff --git a/deployment/docker/push.sh b/deployment/docker/push.sh index 42c848fc..5d54f72b 100755 --- a/deployment/docker/push.sh +++ b/deployment/docker/push.sh @@ -1,3 +1,5 @@ +# Run me from the project root !! + VERSION=$(jq -r '.version' package.json) docker push "localhost:5000/comify:$VERSION" \ No newline at end of file diff --git a/example.env b/example.env index 222fceb0..4f0f4bfd 100644 --- a/example.env +++ b/example.env @@ -43,7 +43,7 @@ HTTP_DRIVER="fetch" # LOGGING (console | void) LOGGING_DRIVER="console" LOGGING_LEVEL="INFO" -LOGGING_DB_RECORD_TYPE="logs" +#LOGGING_DB_RECORD_TYPE="logs" # NOTIFICATIN (memory | webpush) NOTIFICATION_DRIVER="memory" diff --git a/package.json b/package.json index 2101025d..5e7ae1cd 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "comify", "private": true, - "version": "0.0.1", + "version": "0.2.2", "type": "module", "scripts": { "artifacts": "npm run build && npm run dist", @@ -29,6 +29,7 @@ "dev": "jitar start --env-file=development.env --service=deployment/services/development/worker.json --http-body-limit=512000", "demo": "jitar start --env-file=development.env --service=deployment/services/demonstration/social.json --http-body-limit=512000", + "gateway": "jitar start --env-file=development.env --service=deployment/services/production/gateway.json --http-body-limit=512000", "bff": "jitar start --env-file=development.env --service=deployment/services/production/bff.json --http-body-limit=512000", "notification": "jitar start --env-file=development.env --service=deployment/services/production/notification.json --http-body-limit=512000", @@ -36,7 +37,9 @@ "reads2": "jitar start --env-file=development.env --service=deployment/services/production/reads2.json --http-body-limit=512000", "writes": "jitar start --env-file=development.env --service=deployment/services/production/writes.json --http-body-limit=512000", "social-app": "jitar start --env-file=development.env --service=deployment/services/production/social-app.json --http-body-limit=512000", - "proxy": "jitar start --env-file=development.env --service=deployment/services/production/proxy.json --http-body-limit=512000" + "proxy": "jitar start --env-file=development.env --service=deployment/services/production/proxy.json --http-body-limit=512000", + + "containerd": "jitar start --log-level=warn --service=service.json --http-body-limit=640000" }, "workspaces": [ "development/common", From fffecbe3c01f4e1e7ea66a54a6291a70bdf9d90c Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Sat, 26 Sep 2026 21:29:29 +0200 Subject: [PATCH 2/3] #520: improvements --- deployment/docker/Dockerfile | 4 ++-- deployment/jitar.prod.json | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 deployment/jitar.prod.json diff --git a/deployment/docker/Dockerfile b/deployment/docker/Dockerfile index 0d91c320..dee18c9a 100644 --- a/deployment/docker/Dockerfile +++ b/deployment/docker/Dockerfile @@ -9,11 +9,11 @@ COPY package.json /opt/app/package.json COPY package-lock.json /opt/app/package-lock.json # INIT configs -COPY jitar.json /opt/app/jitar.json +COPY deployment/jitar.prod.json /opt/app/jitar.json COPY deployment/services/demonstration/social.json /opt/app/service.json # Init dist -RUN mkdir -p /opt/app/dist +RUN mkdir /opt/app/dist COPY artifacts/dist /opt/app/dist WORKDIR /opt/app diff --git a/deployment/jitar.prod.json b/deployment/jitar.prod.json new file mode 100644 index 00000000..896068b6 --- /dev/null +++ b/deployment/jitar.prod.json @@ -0,0 +1,3 @@ +{ + "target": "./dist" +} \ No newline at end of file From 47b784a15a003819b791d6f2bfba51b021e3a0fd Mon Sep 17 00:00:00 2001 From: Peter van Vliet Date: Sat, 26 Sep 2026 23:25:28 +0200 Subject: [PATCH 3/3] #520: updated version --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5e7ae1cd..96af06d2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "comify", "private": true, - "version": "0.2.2", + "version": "0.2.3", "type": "module", "scripts": { "artifacts": "npm run build && npm run dist",