From 6bc76ab993fadbbb2e6444ec216d3d5f764eead5 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 3 Jul 2024 12:30:08 +0300 Subject: [PATCH 01/19] test aabb9ebc --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6e3ccf67..b7ca9a71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.15.8 +ARG SERVER_VERSION=aabb9ebc # Builder image to compile the website FROM ubuntu as builder @@ -29,7 +29,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ From 079fbba551b3e845cb1ae0d2982564b407801568 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 10 Jul 2024 15:10:24 +0300 Subject: [PATCH 02/19] test 08e54c06 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b7ca9a71..74510996 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=aabb9ebc +ARG SERVER_VERSION=08e54c06 # Builder image to compile the website FROM ubuntu as builder From 6b1e70e1236467b0dec54fce1fdb0251e6fd26d6 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 15 Jul 2024 20:57:38 +0300 Subject: [PATCH 03/19] test f1dd7952 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 74510996..6521c813 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=08e54c06 +ARG SERVER_VERSION=f1dd7952 # Builder image to compile the website FROM ubuntu as builder From 1b9a8a7ddaaa7251b5107166fa69355a201b7deb Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 15 Jul 2024 21:20:07 +0300 Subject: [PATCH 04/19] enabe extension control --- configuration/application.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configuration/application.yml b/configuration/application.yml index 722b0f27..843edee1 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -165,6 +165,8 @@ ovsx: migrations: delay: seconds: 300 + extension-control: + update-on-start: true integrity: key-pair: renew registry: From 5fc3f14e1aba17959019eb0744eb3e05c3c27912 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Mon, 15 Jul 2024 22:03:14 +0300 Subject: [PATCH 05/19] test c715a053 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6521c813..bad9f144 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=f1dd7952 +ARG SERVER_VERSION=c715a053 # Builder image to compile the website FROM ubuntu as builder From bebf13a685b820b314851c38d376927775f3b9e4 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 17 Jul 2024 11:29:33 +0300 Subject: [PATCH 06/19] test b7f621f2 --- Dockerfile | 2 +- configuration/application.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index bad9f144..6b902794 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=c715a053 +ARG SERVER_VERSION=b7f621f2 # Builder image to compile the website FROM ubuntu as builder diff --git a/configuration/application.yml b/configuration/application.yml index 843edee1..928fa9ce 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -168,6 +168,6 @@ ovsx: extension-control: update-on-start: true integrity: - key-pair: renew + key-pair: create registry: version: \ No newline at end of file From 978d67885a4474572724a8285a55baae01fb8233 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 17 Jul 2024 12:03:39 +0300 Subject: [PATCH 07/19] test 0121d030 --- Dockerfile | 4 ++-- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b902794..ecf60ce6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=b7f621f2 +ARG SERVER_VERSION=0121d030 # Builder image to compile the website FROM ubuntu as builder @@ -21,7 +21,7 @@ RUN corepack enable RUN corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.11.9 +ENV WEBSITE_VERSION 0.11.10-next.0121d030 COPY . /workdir RUN /usr/bin/yarn --cwd website \ diff --git a/website/package.json b/website/package.json index 4bbd1b47..2fffd1b1 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.11.10" + "openvsx-webui": "0.11.10-next.0121d030" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 1696efe9..470396cc 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2297,7 +2297,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.19.2" - openvsx-webui: "npm:0.11.10" + openvsx-webui: "npm:0.11.10-next.0121d030" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2318,9 +2318,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.11.10": - version: 0.11.10 - resolution: "openvsx-webui@npm:0.11.10" +"openvsx-webui@npm:0.11.10-next.0121d030": + version: 0.11.10-next.0121d030 + resolution: "openvsx-webui@npm:0.11.10-next.0121d030" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2347,7 +2347,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: ced9d7959a6648cd83399e34503362abced60f0333ab3cb646f9e5b66e10b8ca94bc489ddbbc8645f99cefc7c3bfba176d42bb11cc92cf259a003fe78b2e49a6 + checksum: cee82989b4c31a5949384feb48adda1889dec01c4cd5d81b5b1f2ff3769d6df5674a09cc8eff4c848358b5c281abccfea28fad8c68c6d7151381c7053b615d65 languageName: node linkType: hard From 2190152b671f685b50d33dd339cb83dbd72e7eed Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 17 Jul 2024 13:31:49 +0300 Subject: [PATCH 08/19] test 4c23db4d --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ecf60ce6..0c018424 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=0121d030 +ARG SERVER_VERSION=4c23db4d # Builder image to compile the website FROM ubuntu as builder From 02c3a5e38846cf96b633bb397b4b77aaf282ddef Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Wed, 17 Jul 2024 14:12:22 +0300 Subject: [PATCH 09/19] test bc402560 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0c018424..be7ba8d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=4c23db4d +ARG SERVER_VERSION=bc402560 # Builder image to compile the website FROM ubuntu as builder From fbcd5b2d9ed1a4f8a12533cb24b3039e8e929f1f Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 18 Jul 2024 20:25:42 +0300 Subject: [PATCH 10/19] Revert back to production for Jetty baseline load test --- Dockerfile | 6 +++--- configuration/application.yml | 2 -- website/package.json | 2 +- website/yarn.lock | 10 +++++----- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index be7ba8d3..a9e687d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=bc402560 +ARG SERVER_VERSION=v0.15.8 # Builder image to compile the website FROM ubuntu as builder @@ -21,7 +21,7 @@ RUN corepack enable RUN corepack prepare yarn@stable --activate # bump to update website -ENV WEBSITE_VERSION 0.11.10-next.0121d030 +ENV WEBSITE_VERSION 0.11.10 COPY . /workdir RUN /usr/bin/yarn --cwd website \ @@ -29,7 +29,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/configuration/application.yml b/configuration/application.yml index 928fa9ce..9d6d570c 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -165,8 +165,6 @@ ovsx: migrations: delay: seconds: 300 - extension-control: - update-on-start: true integrity: key-pair: create registry: diff --git a/website/package.json b/website/package.json index 2fffd1b1..4bbd1b47 100644 --- a/website/package.json +++ b/website/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/eclipse/open-vsx.org", "license": "EPL-2.0", "dependencies": { - "openvsx-webui": "0.11.10-next.0121d030" + "openvsx-webui": "0.11.10" }, "peerDependencies": { "@babel/core": "^7.0.0" diff --git a/website/yarn.lock b/website/yarn.lock index 470396cc..1696efe9 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -2297,7 +2297,7 @@ __metadata: "@types/react-router-dom": "npm:^5.3.3" css-loader: "npm:^6.8.1" express: "npm:^4.19.2" - openvsx-webui: "npm:0.11.10-next.0121d030" + openvsx-webui: "npm:0.11.10" source-map-loader: "npm:^4.0.1" style-loader: "npm:^3.3.3" typescript: "npm:~5.1.6" @@ -2318,9 +2318,9 @@ __metadata: languageName: node linkType: hard -"openvsx-webui@npm:0.11.10-next.0121d030": - version: 0.11.10-next.0121d030 - resolution: "openvsx-webui@npm:0.11.10-next.0121d030" +"openvsx-webui@npm:0.11.10": + version: 0.11.10 + resolution: "openvsx-webui@npm:0.11.10" dependencies: "@emotion/react": "npm:^11.11.1" "@emotion/styled": "npm:^11.11.0" @@ -2347,7 +2347,7 @@ __metadata: react-router-dom: "npm:^6.14.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: cee82989b4c31a5949384feb48adda1889dec01c4cd5d81b5b1f2ff3769d6df5674a09cc8eff4c848358b5c281abccfea28fad8c68c6d7151381c7053b615d65 + checksum: ced9d7959a6648cd83399e34503362abced60f0333ab3cb646f9e5b66e10b8ca94bc489ddbbc8645f99cefc7c3bfba176d42bb11cc92cf259a003fe78b2e49a6 languageName: node linkType: hard From ddbd305ab053e74480bda166428d01d3a2879ff0 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Thu, 18 Jul 2024 21:53:07 +0300 Subject: [PATCH 11/19] test jetty server --- Dockerfile | 4 ++-- configuration/application.yml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a9e687d3..2d03b44f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.15.8 +ARG SERVER_VERSION=47c19091 # Builder image to compile the website FROM ubuntu as builder @@ -29,7 +29,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ diff --git a/configuration/application.yml b/configuration/application.yml index 9d6d570c..d0f3d7c8 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -14,6 +14,10 @@ server: enabled: true mime-types: text/html,text/plain,text/css,application/javascript,application/json,text/xml,application/xml,application/xml+rss,text/javascript min-response-size: 1024 + jetty: + threads: + max-queue-capacity: 1 + max-http-post-size: 536870912 spring: application: name: openvsx-server From 3022a8040cf150bb76ed33ff7f0646bc75829195 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 19 Jul 2024 08:42:42 +0300 Subject: [PATCH 12/19] test 869fd63b --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2d03b44f..9fbecb49 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=47c19091 +ARG SERVER_VERSION=869fd63b # Builder image to compile the website FROM ubuntu as builder From 98adb0ab34001ff215871e0baf05fff92e6417ba Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Fri, 19 Jul 2024 10:42:00 +0300 Subject: [PATCH 13/19] test 344c7376 increase max queue capacity --- Dockerfile | 2 +- configuration/application.yml | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9fbecb49..164f433d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=869fd63b +ARG SERVER_VERSION=344c7376 # Builder image to compile the website FROM ubuntu as builder diff --git a/configuration/application.yml b/configuration/application.yml index d0f3d7c8..98ce113a 100644 --- a/configuration/application.yml +++ b/configuration/application.yml @@ -16,8 +16,7 @@ server: min-response-size: 1024 jetty: threads: - max-queue-capacity: 1 - max-http-post-size: 536870912 + max-queue-capacity: 100 spring: application: name: openvsx-server From d1d7ff48c9e3aa10ed96157eadd3860269022887 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 23 Jul 2024 11:13:19 +0300 Subject: [PATCH 14/19] test f309f916 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 164f433d..0c884e25 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=344c7376 +ARG SERVER_VERSION=f309f916 # Builder image to compile the website FROM ubuntu as builder From 7ef8aca9372c433953e349ec6c36188194868659 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 23 Jul 2024 17:14:04 +0300 Subject: [PATCH 15/19] test 52a67d7a --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 0c884e25..b2d985d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=f309f916 +ARG SERVER_VERSION=52a67d7a # Builder image to compile the website FROM ubuntu as builder From 09ccb08781f561154723f8a4139271ceae96a23a Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 23 Jul 2024 20:30:46 +0300 Subject: [PATCH 16/19] test 54bc7b4e --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b2d985d9..b44bbe30 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=52a67d7a +ARG SERVER_VERSION=54bc7b4e # Builder image to compile the website FROM ubuntu as builder From 88a3eb746cc252e4a3cf2b7d4d774ce2fdfacc42 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Tue, 23 Jul 2024 22:46:24 +0300 Subject: [PATCH 17/19] Release v0.16.0 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index b44bbe30..23acba60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=54bc7b4e +ARG SERVER_VERSION=v0.16.0 # Builder image to compile the website FROM ubuntu as builder @@ -29,7 +29,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ From 34e972b84758883588f9b49bbe8229fc899627c8 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Sun, 28 Jul 2024 14:25:09 +0300 Subject: [PATCH 18/19] revert extension control migration --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 23acba60..b6265924 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=v0.16.0 +ARG SERVER_VERSION=4fc1c6da # Builder image to compile the website FROM ubuntu as builder @@ -29,7 +29,8 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} +FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/ From b77ff03d57992cb82ecefa3176bad378284879d3 Mon Sep 17 00:00:00 2001 From: amvanbaren Date: Sun, 28 Jul 2024 14:45:03 +0300 Subject: [PATCH 19/19] release 0.16.0 --- Dockerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index b6265924..23acba60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG SERVER_VERSION=4fc1c6da +ARG SERVER_VERSION=v0.16.0 # Builder image to compile the website FROM ubuntu as builder @@ -29,8 +29,7 @@ RUN /usr/bin/yarn --cwd website \ && /usr/bin/yarn --cwd website build # Main image derived from openvsx-server -# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} -FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION} +FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION} ARG SERVER_VERSION COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/