Skip to content

[code] Build code dependencies separately #8048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2022
Merged

[code] Build code dependencies separately #8048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion WORKSPACE.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaultArgs:
jbMarketplacePublishTrigger: "false"
publishToJBMarketplace: true
localAppVersion: unknown
codeCommit: 4035f15a03e6d92cb9815e366b856e43f1caabe7
codeCommit: 543d66ff57b0b01f48d6f66fc2fa2fc64d26a848
intellijDownloadUrl: "https://download.jetbrains.com/idea/ideaIU-2021.3.2.tar.gz"
golandDownloadUrl: "https://download.jetbrains.com/go/goland-2021.3.3.tar.gz"
pycharmDownloadUrl: "https://download.jetbrains.com/python/pycharm-professional-2021.3.2.tar.gz"
Expand Down
16 changes: 1 addition & 15 deletions components/ide/code/BUILD.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
packages:
- name: docker
type: docker
deps:
- :docker-base
srcs:
- "startup.sh"
- "supervisor-ide-config.json"
- "bin/*"
argdeps:
- imageRepoBase
- codeCommit
prep:
- ["sh", "-c", "sed -i -e 's#BUILDER_BASE#'$(cat components-ide-code--docker-base/imgnames.txt)'#g' Dockerfile"]
config:
dockerfile: leeway.Dockerfile
metadata:
Expand All @@ -20,14 +16,4 @@ packages:
CODE_COMMIT: ${codeCommit}
image:
- ${imageRepoBase}/ide/code:${version}
- ${imageRepoBase}/ide/code:commit-${__git_commit}
- name: docker-base
type: docker
argdeps:
- imageRepoBase
config:
dockerfile: base.Dockerfile
metadata:
helm-component: workspace.codeImage
image:
- ${imageRepoBase}/ide/code-base:commit-${__git_commit}
- ${imageRepoBase}/ide/code:commit-${__git_commit}
26 changes: 0 additions & 26 deletions components/ide/code/base.Dockerfile
View file
Open in desktop

This file was deleted.

42 changes: 33 additions & 9 deletions components/ide/code/leeway.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,50 @@
# Licensed under the GNU Affero General Public License (AGPL).
# See License-AGPL.txt in the project root for license information.

# BUILDER_BASE is a placeholder, will be replaced before build time
# Check BUILD.yaml
FROM BUILDER_BASE as code_installer
FROM gitpod/openvscode-server-linux-build-agent:centos7-devtoolset8-x64 as dependencies_builder

ARG CODE_COMMIT

RUN mkdir /gp-code \
&& cd /gp-code \
&& git init \
&& git remote add origin https://github.com/gitpod-io/vscode \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
&& git remote add origin https://github.com/gitpod-io/vscode \
&& git remote add origin https://github.com/gitpod-io/openvscode-server \

&& git fetch origin $CODE_COMMIT --depth=1 \
&& git reset --hard FETCH_HEAD
WORKDIR /gp-code
RUN yarn --cwd remote --frozen-lockfile --network-timeout 180000


FROM gitpod/openvscode-server-linux-build-agent:bionic-x64 as code_installer

USER root

ARG CODE_COMMIT

ARG NODE_VERSION=14.18.2
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dependencies_builder use node 16, will this have incompatibility issues?

ARG NVM_DIR="/root/.nvm"
RUN mkdir -p $NVM_DIR \
&& curl -fsSL https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | sh \
&& . $NVM_DIR/nvm.sh \
&& nvm alias default $NODE_VERSION
ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH

ENV PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD 1
ENV ELECTRON_SKIP_BINARY_DOWNLOAD 1

RUN mkdir gp-code \
&& cd gp-code \
RUN mkdir /gp-code \
&& cd /gp-code \
&& git init \
&& git remote add origin https://github.com/gitpod-io/vscode \
&& git fetch origin $CODE_COMMIT --depth=1 \
&& git reset --hard FETCH_HEAD
WORKDIR /gp-code
RUN yarn --frozen-lockfile --network-timeout 180000
RUN yarn --cwd ./extensions compile
RUN yarn gulp vscode-web-min
RUN yarn gulp vscode-reh-linux-x64-min
RUN yarn --frozen-lockfile --network-timeout 180000 \
&& yarn --cwd remote/web --frozen-lockfile --network-timeout 180000 \
&& yarn --cwd extensions compile \
&& yarn gulp vscode-web-min \
&& yarn gulp vscode-reh-linux-x64-min
COPY --from=dependencies_builder /gp-code/remote/node_modules/ /vscode-reh-linux-x64/node_modules/

# config for first layer needed by blobserve
# we also remove `static/` from resource urls as that's needed by blobserve,
Expand Down