Skip to content

Commit 5a8eb21

Browse files
authored
Merge pull request #2 from cloudacademy/update-101.1
version 101.1 (and yarn removal)
2 parents 5e26d43 + ac67be8 commit 5a8eb21

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

Dockerfile

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
ARG BASE=ubuntu:24.04
33

44
# build is based on https://coder.com/docs/code-server/latest/CONTRIBUTING
5-
FROM node:20.17-bookworm as build
5+
FROM node:22-bookworm as build
66

7-
ARG CODE_SERVER_VERSION=4.93.1
8-
ARG VS_CODE_VERSION=1.93.1
7+
ARG CODE_SERVER_VERSION=4.101.1
8+
ARG VS_CODE_VERSION=1.101.1
99

1010
RUN echo 'deb [trusted=yes] https://repo.goreleaser.com/apt/ /' | tee /etc/apt/sources.list.d/goreleaser.list
1111
RUN apt-get update --allow-insecure-repositories
12-
RUN apt-get install --allow-unauthenticated -y git-lfs yarn nfpm jq gnupg quilt rsync unzip bats \
12+
RUN apt-get install --allow-unauthenticated -y git-lfs nfpm jq gnupg quilt rsync unzip bats \
1313
build-essential g++ libx11-dev libxkbfile-dev libsecret-1-dev libkrb5-dev python-is-python3
1414

1515
WORKDIR /code-server
@@ -23,13 +23,12 @@ RUN jq ".version = \"${CODE_SERVER_VERSION}-calabs\"" package.json > /tmp/packag
2323
RUN quilt push -a
2424
# remove insecure notification check without impacting other patches (look at https://github.com/coder/code-server/blob/main/patches/insecure-notification.diff for what to remove)
2525
RUN sed -i '/if (!window.isSecureContext)/,+24d' lib/vscode/src/vs/workbench/browser/client.ts
26-
RUN yarn install --frozen-lockfile
27-
RUN yarn add ternary-stream # address 1.83.1 build issue https://github.com/cloudacademy/ca-code-server/actions/runs/6778516221/job/18424106568
28-
RUN yarn build
29-
RUN VERSION=${VS_CODE_VERSION} yarn build:vscode
30-
RUN yarn release
31-
RUN yarn release:standalone
32-
RUN VERSION=${VS_CODE_VERSION} yarn package
26+
RUN npm install
27+
RUN npm run build
28+
RUN VERSION=${VS_CODE_VERSION} npm run build:vscode
29+
RUN npm run release
30+
RUN npm run release:standalone
31+
RUN VERSION=${VS_CODE_VERSION} npm run package
3332

3433

3534
# release is based on https://github.com/coder/code-server/blob/70aa1b77226ea40e5d661103de7b354f742a76df/ci/release-image/Dockerfile

0 commit comments

Comments
 (0)