Skip to content

Commit 3989df8

Browse files
authored
Merge pull request #3414 from amvanbaren/test-ec87ad32
test ec87ad32
2 parents 974ec18 + 7bebb24 commit 3989df8

File tree

6 files changed

+946
-905
lines changed

6 files changed

+946
-905
lines changed

Dockerfile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG SERVER_VERSION=v0.21.1
1+
ARG SERVER_VERSION=ec87ad32
22

33
# Builder image to compile the website
44
FROM ubuntu AS builder
@@ -19,15 +19,16 @@ RUN apt-get update \
1919
&& corepack prepare yarn@stable --activate
2020

2121
# bump to update website
22-
ENV WEBSITE_VERSION 0.14.0
22+
ENV WEBSITE_VERSION 0.15.0-next.ec87ad32
2323
COPY . /workdir
2424

2525
RUN /usr/bin/yarn --cwd website \
2626
&& /usr/bin/yarn --cwd website compile \
2727
&& /usr/bin/yarn --cwd website build
2828

2929
# Main image derived from openvsx-server
30-
FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
30+
# FROM ghcr.io/eclipse/openvsx-server:${SERVER_VERSION}
31+
FROM docker.io/amvanbaren/openvsx-server:${SERVER_VERSION}
3132
ARG SERVER_VERSION
3233

3334
COPY --from=builder --chown=openvsx:openvsx /workdir/website/static/ BOOT-INF/classes/static/

website/.yarn/releases/yarn-4.3.1.cjs

Lines changed: 0 additions & 894 deletions
This file was deleted.

website/.yarn/releases/yarn-4.6.0.cjs

Lines changed: 934 additions & 0 deletions
Large diffs are not rendered by default.

website/.yarnrc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ enableGlobalCache: false
44

55
nodeLinker: node-modules
66

7-
yarnPath: .yarn/releases/yarn-4.3.1.cjs
7+
yarnPath: .yarn/releases/yarn-4.6.0.cjs

website/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"repository": "https://github.com/eclipse/open-vsx.org",
77
"license": "EPL-2.0",
88
"dependencies": {
9-
"openvsx-webui": "0.14.0"
9+
"openvsx-webui": "0.15.0-next.ec87ad32"
1010
},
1111
"peerDependencies": {
1212
"@babel/core": "^7.0.0"
@@ -35,5 +35,5 @@
3535
"watch:dev": "webpack --config dev/webpack.config.js --mode=development --watch",
3636
"start:dev": "node dev/server"
3737
},
38-
"packageManager": "yarn@4.3.1"
38+
"packageManager": "yarn@4.6.0"
3939
}

website/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2399,7 +2399,7 @@ __metadata:
23992399
"@types/react-router-dom": "npm:^5.3.3"
24002400
css-loader: "npm:^6.8.1"
24012401
express: "npm:^4.21.2"
2402-
openvsx-webui: "npm:0.14.0"
2402+
openvsx-webui: "npm:0.15.0-next.ec87ad32"
24032403
source-map-loader: "npm:^4.0.1"
24042404
style-loader: "npm:^3.3.3"
24052405
typescript: "npm:~5.1.6"
@@ -2420,9 +2420,9 @@ __metadata:
24202420
languageName: node
24212421
linkType: hard
24222422

2423-
"openvsx-webui@npm:0.14.0":
2424-
version: 0.14.0
2425-
resolution: "openvsx-webui@npm:0.14.0"
2423+
"openvsx-webui@npm:0.15.0-next.ec87ad32":
2424+
version: 0.15.0-next.ec87ad32
2425+
resolution: "openvsx-webui@npm:0.15.0-next.ec87ad32"
24262426
dependencies:
24272427
"@emotion/react": "npm:^11.11.1"
24282428
"@emotion/styled": "npm:^11.11.0"
@@ -2448,7 +2448,7 @@ __metadata:
24482448
react-router-dom: "npm:^6.14.1"
24492449
peerDependencies:
24502450
"@babel/core": ^7.0.0
2451-
checksum: 10/e2128612aebd8d42d2bb9399d4adce64c3efb812b60f53c57cefc625ce52e60c36bd7fdd9c1cb186f13f774bb6e0e6f7c0530cc428e9a364ad8e1c533e930abe
2451+
checksum: 10/b14725af22a792a4ebc0db4149e09011917a6639243d1ac7d04a5dcc22c1f2ea5993731cc2d4fa456189e4568867a5895e9c73533622253dba7610fa63d6f052
24522452
languageName: node
24532453
linkType: hard
24542454

0 commit comments

Comments
 (0)