Skip to content
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

Nodejs from sources #258

Closed
wants to merge 22 commits into from
Closed

Nodejs from sources #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
cec479d
Test fully-static key
RomanNikitenko Jul 11, 2023
f9084b2
Use enable-static key
RomanNikitenko Jul 11, 2023
6682b1f
Use --partly-static key
RomanNikitenko Jul 11, 2023
8e117b1
test fully static with j1
RomanNikitenko Jul 11, 2023
6dc1873
Code clean up
RomanNikitenko Jul 11, 2023
7cac814
Test 'configure' for downloaded node.js
RomanNikitenko Jul 11, 2023
7d50da7
Add node version
RomanNikitenko Jul 11, 2023
284aa4e
Fix node version
RomanNikitenko Jul 11, 2023
5a11a23
Add wget
RomanNikitenko Jul 11, 2023
5c4eecc
Change node.js package for downloading
RomanNikitenko Jul 11, 2023
97687da
Test nodejs
RomanNikitenko Jul 12, 2023
10957c3
Fix build
RomanNikitenko Jul 12, 2023
e38b14b
Fix build
RomanNikitenko Jul 13, 2023
8cf23b8
Use correct node binary file for node_modules as well
RomanNikitenko Jul 14, 2023
c85d240
test other keys for building
RomanNikitenko Jul 14, 2023
6c26b25
Try partly-static key
RomanNikitenko Jul 15, 2023
4f2eb40
Try to build fully static Node.js using Fedora-based image
RomanNikitenko Jul 20, 2023
d4cc700
Use built node.js for Che Code building
RomanNikitenko Jul 20, 2023
f22ffd2
build only libc assembly
RomanNikitenko Jul 31, 2023
29041a6
Add krb5-devel
RomanNikitenko Jul 31, 2023
a4e2ee2
Add memory for building VS Code
RomanNikitenko Aug 1, 2023
8f70926
Turn off tests
RomanNikitenko Aug 1, 2023
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
4 changes: 2 additions & 2 deletions build/dockerfiles/assembly.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

# Grab content from previously build images
FROM linux-libc-amd64 as linux-libc-content
FROM linux-musl-amd64 as linux-musl-content
# FROM linux-musl-amd64 as linux-musl-content

# https://quay.io/eclipse/che-machine-exec#^7\.
FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
Expand All @@ -21,7 +21,7 @@ RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/

WORKDIR /mnt/rootfs

COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
# COPY --from=linux-musl-content --chown=0:0 /checode-linux-musl /mnt/rootfs/checode-linux-musl
COPY --from=linux-libc-content --chown=0:0 /checode-linux-libc /mnt/rootfs/checode-linux-libc

RUN mkdir -p /mnt/rootfs/projects && mkdir -p /mnt/rootfs/home/che && mkdir -p /mnt/rootfs/bin/
Expand Down
120 changes: 60 additions & 60 deletions build/dockerfiles/dev.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,80 +7,80 @@
#

# https://quay.io/eclipse/che-machine-exec#^7\.
FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec
# FROM quay.io/eclipse/che-machine-exec:7.56.0 as machine-exec

# https://registry.access.redhat.com/ubi8/ubi
FROM registry.access.redhat.com/ubi8/ubi:8.6-990 AS ubi-micro-build
RUN mkdir -p /mnt/rootfs
RUN ARCH=$(uname -m) && yum install --installroot /mnt/rootfs libsecret curl make cmake gcc gcc-c++ python3 git git-core-doc openssh less wget \
"https://rpmfind.net/linux/centos/8-stream/BaseOS/x86_64/os/Packages/libsecret-devel-0.18.6-1.el8.x86_64.rpm" \
"https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libxkbfile-1.1.0-1.el8.x86_64.rpm" \
"https://rpmfind.net/linux/centos/8-stream/PowerTools/x86_64/os/Packages/libxkbfile-devel-1.1.0-1.el8.x86_64.rpm" \
procps vi nano \
"https://rpmfind.net/linux/centos/8-stream/BaseOS/${ARCH}/os/Packages/zsh-5.5.1-6.el8_1.2.x86_64.rpm" \
"http://mirror.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm" \
"http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm" \
"http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm" \
libX11-devel libxkbcommon krb5-devel bash tar gzip rsync patch pkg-config glib2-devel coreutils-single glibc-minimal-langpack which util-linux-user --releasever 8 --nodocs -y && yum --installroot /mnt/rootfs clean all
# node-gyp will search for python
RUN cd /mnt/rootfs && ln -s /usr/bin/python3 ./usr/bin/python
# RUN mkdir -p /mnt/rootfs
# # RUN ARCH=$(uname -m) && yum install --installroot /mnt/rootfs libsecret curl make cmake gcc gcc-c++ python3 git git-core-doc openssh less wget \
# "https://rpmfind.net/linux/centos/8-stream/BaseOS/x86_64/os/Packages/libsecret-devel-0.18.6-1.el8.x86_64.rpm" \
# "https://rpmfind.net/linux/centos/8-stream/AppStream/x86_64/os/Packages/libxkbfile-1.1.0-1.el8.x86_64.rpm" \
# "https://rpmfind.net/linux/centos/8-stream/PowerTools/x86_64/os/Packages/libxkbfile-devel-1.1.0-1.el8.x86_64.rpm" \
# procps vi nano \
# "https://rpmfind.net/linux/centos/8-stream/BaseOS/${ARCH}/os/Packages/zsh-5.5.1-6.el8_1.2.x86_64.rpm" \
# "http://mirror.centos.org/centos/8/extras/${ARCH}/os/Packages/epel-release-8-11.el8.noarch.rpm" \
# "http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-gpg-keys-8-3.el8.noarch.rpm" \
# "http://mirror.centos.org/centos/8-stream/BaseOS/${ARCH}/os/Packages/centos-stream-repos-8-3.el8.noarch.rpm" \
# libX11-devel libxkbcommon krb5-devel bash tar gzip rsync patch pkg-config glib2-devel coreutils-single glibc-minimal-langpack which util-linux-user --releasever 8 --nodocs -y && yum --installroot /mnt/rootfs clean all
# # node-gyp will search for python
# RUN cd /mnt/rootfs && ln -s /usr/bin/python3 ./usr/bin/python

RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
# RUN rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*

# Download nodejs required by VS Code
RUN mkdir -p /mnt/rootfs/opt/nodejs && curl -sL https://nodejs.org/download/release/v16.17.1/node-v16.17.1-linux-x64.tar.gz | tar xzf - -C /mnt/rootfs/opt/nodejs --strip-components=1
# # Download nodejs required by VS Code
# RUN mkdir -p /mnt/rootfs/opt/nodejs && curl -sL https://nodejs.org/download/release/v16.17.1/node-v16.17.1-linux-x64.tar.gz | tar xzf - -C /mnt/rootfs/opt/nodejs --strip-components=1

# Download kubectl
RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
chmod +x kubectl && \
mv kubectl /mnt/rootfs/usr/bin/
# # Download kubectl
# RUN curl -LO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl" && \
# chmod +x kubectl && \
# mv kubectl /mnt/rootfs/usr/bin/

# setup home folder inside the new fs
ENV HOME=/mnt/rootfs/home/che
ENV NPM_CONFIG_PREFIX=/mnt/rootfs/home/che/.npm-global
ENV PATH /mnt/rootfs/opt/nodejs/bin:/mnt/rootfs/home/che/.npm-global/bin/:$PATH
# # setup home folder inside the new fs
# ENV HOME=/mnt/rootfs/home/che
# ENV NPM_CONFIG_PREFIX=/mnt/rootfs/home/che/.npm-global
# ENV PATH /mnt/rootfs/opt/nodejs/bin:/mnt/rootfs/home/che/.npm-global/bin/:$PATH

# install yarn
RUN npm install -g yarn
# # install yarn
# RUN npm install -g yarn

ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0
# ENV ELECTRON_SKIP_BINARY_DOWNLOAD=1 \
# PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=0

RUN cat /mnt/rootfs/etc/passwd | sed s#root:x.*#root:x:\${USER_ID}:\${GROUP_ID}::\${HOME}:/bin/bash#g > /mnt/rootfs/home/che/.passwd.template \
&& cat /mnt/rootfs/etc/group | sed s#root:x:0:#root:x:0:0,\${USER_ID}:#g > /mnt/rootfs/home/che/.group.template
# RUN cat /mnt/rootfs/etc/passwd | sed s#root:x.*#root:x:\${USER_ID}:\${GROUP_ID}::\${HOME}:/bin/bash#g > /mnt/rootfs/home/che/.passwd.template \
# && cat /mnt/rootfs/etc/group | sed s#root:x:0:#root:x:0:0,\${USER_ID}:#g > /mnt/rootfs/home/che/.group.template

COPY --from=machine-exec --chown=0:0 /go/bin/che-machine-exec /mnt/rootfs/bin/machine-exec
COPY --chmod=755 /build/scripts/entrypoint-dev.sh /mnt/rootfs/entrypoint.sh
COPY --chmod=755 /build/conf/dev/.p10k.zsh /mnt/rootfs/home/che/.p10k.zsh
# COPY --from=machine-exec --chown=0:0 /go/bin/che-machine-exec /mnt/rootfs/bin/machine-exec
# COPY --chmod=755 /build/scripts/entrypoint-dev.sh /mnt/rootfs/entrypoint.sh
# COPY --chmod=755 /build/conf/dev/.p10k.zsh /mnt/rootfs/home/che/.p10k.zsh

RUN mkdir -p /mnt/rootfs/projects
# RUN mkdir -p /mnt/rootfs/projects

RUN for f in "/mnt/rootfs/home/che" "/mnt/rootfs/etc/passwd" "/mnt/rootfs/etc/group" "/mnt/rootfs/projects" ; do\
chgrp -R 0 ${f} && \
chmod -R g+rwX ${f}; \
done
# RUN for f in "/mnt/rootfs/home/che" "/mnt/rootfs/etc/passwd" "/mnt/rootfs/etc/group" "/mnt/rootfs/projects" ; do\
# chgrp -R 0 ${f} && \
# chmod -R g+rwX ${f}; \
# done

FROM scratch
COPY --from=ubi-micro-build /mnt/rootfs/ /
ENV HOME=/home/che
ENV NPM_CONFIG_PREFIX=/home/che/.npm-global
ENV PATH /opt/nodejs/bin:/home/che/.npm-global/bin/:$PATH
ENTRYPOINT /entrypoint.sh
WORKDIR /projects
RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh && \
cp $HOME/.oh-my-zsh/templates/zshrc.zsh-template $HOME/.zshrc && \
chsh -s $(which zsh) root && \
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git $HOME/.oh-my-zsh/custom/themes/powerlevel10k && \
git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions $HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions && \
sed -i 's|\(ZSH_THEME="\).*|\1powerlevel10k/powerlevel10k"|' $HOME/.zshrc && \
# Add zsh autosuggestions plug-in
sed -i 's|plugins=(\(.*\))|plugins=(\1 zsh-autosuggestions)|' $HOME/.zshrc && \
echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> $HOME/.zshrc
# COPY --from=ubi-micro-build /mnt/rootfs/ /
# ENV HOME=/home/che
# ENV NPM_CONFIG_PREFIX=/home/che/.npm-global
# ENV PATH /opt/nodejs/bin:/home/che/.npm-global/bin/:$PATH
# ENTRYPOINT /entrypoint.sh
# WORKDIR /projects
# RUN wget https://github.com/robbyrussell/oh-my-zsh/raw/master/tools/install.sh -O - | zsh && \
# cp $HOME/.oh-my-zsh/templates/zshrc.zsh-template $HOME/.zshrc && \
# chsh -s $(which zsh) root && \
# git clone --depth=1 https://github.com/romkatv/powerlevel10k.git $HOME/.oh-my-zsh/custom/themes/powerlevel10k && \
# git clone --depth=1 https://github.com/zsh-users/zsh-autosuggestions $HOME/.oh-my-zsh/custom/plugins/zsh-autosuggestions && \
# sed -i 's|\(ZSH_THEME="\).*|\1powerlevel10k/powerlevel10k"|' $HOME/.zshrc && \
# # Add zsh autosuggestions plug-in
# sed -i 's|plugins=(\(.*\))|plugins=(\1 zsh-autosuggestions)|' $HOME/.zshrc && \
# echo "[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh" >> $HOME/.zshrc

ENV ZSH_DISABLE_COMPFIX="true"
# build che-code and keep node-modules folder
RUN git clone --depth 1 https://github.com/che-incubator/che-code /tmp/che-code && \
cd /tmp/che-code && yarn && cd /tmp/che-code/code && yarn compile && \
tar zcf /home/che/.node_modules.tgz node_modules && rm -rf /tmp/che-code && \
chgrp -R 0 /home/che && chmod -R g+rwX /home/che
# ENV ZSH_DISABLE_COMPFIX="true"
# # build che-code and keep node-modules folder
# RUN git clone --depth 1 https://github.com/che-incubator/che-code /tmp/che-code && \
# cd /tmp/che-code && yarn && cd /tmp/che-code/code && yarn compile && \
# tar zcf /home/che/.node_modules.tgz node_modules && rm -rf /tmp/che-code && \
# chgrp -R 0 /home/che && chmod -R g+rwX /home/che
USER 1001
Loading