Skip to content

Commit

Permalink
Merge pull request #2923 from amvanbaren/test-extension-control
Browse files Browse the repository at this point in the history
test extension control feature
  • Loading branch information
amvanbaren authored Sep 13, 2024
2 parents 1bb9285 + b0fbc7a commit 5e9a083
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 9 deletions.
7 changes: 4 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG SERVER_VERSION=v0.16.4
ARG SERVER_VERSION=134d9a19

# Builder image to compile the website
FROM ubuntu as builder
Expand All @@ -21,15 +21,16 @@ RUN corepack enable
RUN corepack prepare yarn@stable --activate

# bump to update website
ENV WEBSITE_VERSION 0.11.11
ENV WEBSITE_VERSION 0.11.11-next.134d9a19
COPY . /workdir

RUN /usr/bin/yarn --cwd website \
&& /usr/bin/yarn --cwd website compile \
&& /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/
Expand Down
2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"repository": "https://github.com/eclipse/open-vsx.org",
"license": "EPL-2.0",
"dependencies": {
"openvsx-webui": "0.11.11"
"openvsx-webui": "0.11.11-next.134d9a19"
},
"peerDependencies": {
"@babel/core": "^7.0.0"
Expand Down
10 changes: 5 additions & 5 deletions website/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2399,7 +2399,7 @@ __metadata:
"@types/react-router-dom": "npm:^5.3.3"
css-loader: "npm:^6.8.1"
express: "npm:^4.21.0"
openvsx-webui: "npm:0.11.11"
openvsx-webui: "npm:0.11.11-next.134d9a19"
source-map-loader: "npm:^4.0.1"
style-loader: "npm:^3.3.3"
typescript: "npm:~5.1.6"
Expand All @@ -2420,9 +2420,9 @@ __metadata:
languageName: node
linkType: hard

"openvsx-webui@npm:0.11.11":
version: 0.11.11
resolution: "openvsx-webui@npm:0.11.11"
"openvsx-webui@npm:0.11.11-next.134d9a19":
version: 0.11.11-next.134d9a19
resolution: "openvsx-webui@npm:0.11.11-next.134d9a19"
dependencies:
"@emotion/react": "npm:^11.11.1"
"@emotion/styled": "npm:^11.11.0"
Expand All @@ -2448,7 +2448,7 @@ __metadata:
react-router-dom: "npm:^6.14.1"
peerDependencies:
"@babel/core": ^7.0.0
checksum: 10/88f60f969c25cc39b0869b693d6c2176c45528171f12d7042febec5eb0b7d806c6bbcb9f4094f4899c8631b0091fcf139be7e6f3b332604bab1c872a706d02c6
checksum: 10/a84e988b82dc5368c91269de6d7aba99c55eaf056f295611092c43b0b66faec66719e3cfadcae06ec38c64892b94f89150f4e5b5a5f8251371e93a0358b4adf9
languageName: node
linkType: hard

Expand Down

0 comments on commit 5e9a083

Please sign in to comment.