Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,24 @@ RUN apt-get update \
&& apt-get install -y nodejs \
&& apt-get clean \
&& corepack enable \
&& corepack prepare yarn@stable --activate
&& corepack prepare yarn@4.9.1 --activate

ARG OPENVSX_VERSION
ENV VERSION=$OPENVSX_VERSION

RUN git clone --branch ${VERSION} --depth 1 https://github.com/eclipse/openvsx.git /workdir
RUN git clone --branch ${VERSION} --depth 1 https://github.com/eclipse-openvsx/openvsx.git /workdir
COPY ./configuration /workdir/configuration

RUN /usr/bin/yarn --cwd webui \
&& /usr/bin/yarn --cwd webui build \
&& /usr/bin/yarn --cwd webui build:default

RUN cd webui \
&& yarn install --immutable \
&& yarn build \
&& yarn build:default

# Main image derived from openvsx-server
FROM ghcr.io/eclipse/openvsx-server:${OPENVSX_VERSION}
FROM ghcr.io/eclipse-openvsx/openvsx-server:${OPENVSX_VERSION}
ARG OPENVSX_VERSION

COPY --from=builder --chown=openvsx:openvsx /workdir/webui/static/ BOOT-INF/classes/static/
COPY --from=builder --chown=openvsx:openvsx /workdir/configuration/application.yml config/

RUN sed -i "s/<OPENVSX_VERSION>/$OPENVSX_VERSION/g" config/application.yml
RUN sed -i "s/<OPENVSX_VERSION>/$OPENVSX_VERSION/g" config/application.yml
2 changes: 1 addition & 1 deletion deploy/docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

OPENVSX_VERSION=$(curl -sSL https://api.github.com/repos/eclipse/openvsx/releases/latest | jq -r ".tag_name")
OPENVSX_VERSION=$(curl -sSL https://api.github.com/repos/eclipse-openvsx/openvsx/releases/latest | jq -r ".tag_name")
export OPENVSX_VERSION

sudo docker build -t "openvsx:$OPENVSX_VERSION" --build-arg "OPENVSX_VERSION=$OPENVSX_VERSION" .
8 changes: 4 additions & 4 deletions deploy/openshift/openvsx.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ ENV VERSION=$OPENVSX_VERSION

RUN git clone --branch ${VERSION} --depth 1 https://github.com/eclipse/openvsx.git /workdir

RUN yarn --version \
&& yarn --cwd webui \
&& yarn --cwd webui install \
&& yarn --cwd webui build:default
RUN cd webui \
&& yarn --version \
&& yarn install --immutable \
&& yarn build:default

# Main image derived from openvsx-server
FROM ghcr.io/eclipse-openvsx/openvsx-server:${OPENVSX_VERSION}
Expand Down