Skip to content

Commit 2b8da35

Browse files
jrebeyjrebey
committed
Merge remote-tracking branch 'upstream/master' into n-i-x-patch-1
2 parents 9ae8d18 + b456c30 commit 2b8da35

File tree

9 files changed

+264
-86
lines changed

9 files changed

+264
-86
lines changed

‎Dockerfile

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,28 +11,50 @@ LABEL maintainer="aptalca"
1111
ENV HOME="/config"
1212

1313
RUN \
14-
echo "**** install dependencies ****" && \
14+
echo "**** install node repo ****" && \
1515
apt-get update && \
16+
apt-get install -y \
17+
gnupg && \
18+
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
19+
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
20+
> /etc/apt/sources.list.d/nodesource.list && \
21+
curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
22+
echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
23+
> /etc/apt/sources.list.d/yarn.list && \
24+
echo "**** install build dependencies ****" && \
25+
apt-get update && \
26+
apt-get install -y \
27+
build-essential \
28+
libx11-dev \
29+
libxkbfile-dev \
30+
libsecret-1-dev \
31+
pkg-config && \
32+
echo "**** install runtime dependencies ****" && \
1633
apt-get install -y \
1734
git \
1835
jq \
1936
nano \
2037
net-tools \
21-
sudo && \
38+
nodejs \
39+
sudo \
40+
yarn && \
2241
echo "**** install code-server ****" && \
2342
if [ -z ${CODE_RELEASE+x} ]; then \
2443
CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" \
2544
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
2645
fi && \
27-
CODE_URL=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/tags/${CODE_RELEASE}" \
28-
| jq -r '.assets[] | select(.browser_download_url | contains("linux-x86_64")) | .browser_download_url') && \
29-
mkdir -p /app/code-server && \
30-
curl -o \
31-
/tmp/code.tar.gz -L \
32-
"${CODE_URL}" && \
33-
tar xzf /tmp/code.tar.gz -C \
34-
/app/code-server --strip-components=1 && \
46+
CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
47+
yarn --production global add code-server@"$CODE_VERSION" && \
48+
yarn cache clean && \
49+
ln -s /node_modules/.bin/code-server /usr/bin/code-server && \
3550
echo "**** clean up ****" && \
51+
apt-get purge --auto-remove -y \
52+
build-essential \
53+
libx11-dev \
54+
libxkbfile-dev \
55+
libsecret-1-dev \
56+
pkg-config && \
57+
apt-get clean && \
3658
rm -rf \
3759
/tmp/* \
3860
/var/lib/apt/lists/* \

‎Dockerfile.aarch64

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
FROM lsiobase/ubuntu:arm64v8-bionic
2+
3+
# set version label
4+
ARG BUILD_DATE
5+
ARG VERSION
6+
ARG CODE_RELEASE
7+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8+
LABEL maintainer="aptalca"
9+
10+
# environment settings
11+
ENV HOME="/config"
12+
13+
RUN \
14+
echo "**** install node repo ****" && \
15+
apt-get update && \
16+
apt-get install -y \
17+
gnupg && \
18+
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
19+
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
20+
> /etc/apt/sources.list.d/nodesource.list && \
21+
curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
22+
echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
23+
> /etc/apt/sources.list.d/yarn.list && \
24+
echo "**** install build dependencies ****" && \
25+
apt-get update && \
26+
apt-get install -y \
27+
build-essential \
28+
libx11-dev \
29+
libxkbfile-dev \
30+
libsecret-1-dev \
31+
pkg-config && \
32+
echo "**** install runtime dependencies ****" && \
33+
apt-get install -y \
34+
git \
35+
jq \
36+
nano \
37+
net-tools \
38+
nodejs \
39+
sudo \
40+
yarn && \
41+
echo "**** install code-server ****" && \
42+
if [ -z ${CODE_RELEASE+x} ]; then \
43+
CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" \
44+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
45+
fi && \
46+
CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
47+
yarn --production global add code-server@"$CODE_VERSION" && \
48+
yarn cache clean && \
49+
ln -s /node_modules/.bin/code-server /usr/bin/code-server && \
50+
echo "**** clean up ****" && \
51+
apt-get purge --auto-remove -y \
52+
build-essential \
53+
libx11-dev \
54+
libxkbfile-dev \
55+
libsecret-1-dev \
56+
pkg-config && \
57+
apt-get clean && \
58+
rm -rf \
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/*
62+
63+
# add local files
64+
COPY /root /
65+
66+
# ports and volumes
67+
EXPOSE 8443

‎Dockerfile.armhf

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
FROM lsiobase/ubuntu:arm32v7-bionic
2+
3+
# set version label
4+
ARG BUILD_DATE
5+
ARG VERSION
6+
ARG CODE_RELEASE
7+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
8+
LABEL maintainer="aptalca"
9+
10+
# environment settings
11+
ENV HOME="/config"
12+
13+
RUN \
14+
echo "**** install node repo ****" && \
15+
apt-get update && \
16+
apt-get install -y \
17+
gnupg && \
18+
curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - && \
19+
echo 'deb https://deb.nodesource.com/node_12.x bionic main' \
20+
> /etc/apt/sources.list.d/nodesource.list && \
21+
curl -s https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \
22+
echo 'deb https://dl.yarnpkg.com/debian/ stable main' \
23+
> /etc/apt/sources.list.d/yarn.list && \
24+
echo "**** install build dependencies ****" && \
25+
apt-get update && \
26+
apt-get install -y \
27+
build-essential \
28+
libx11-dev \
29+
libxkbfile-dev \
30+
libsecret-1-dev \
31+
pkg-config && \
32+
echo "**** install runtime dependencies ****" && \
33+
apt-get install -y \
34+
git \
35+
jq \
36+
nano \
37+
net-tools \
38+
nodejs \
39+
sudo \
40+
yarn && \
41+
echo "**** install code-server ****" && \
42+
if [ -z ${CODE_RELEASE+x} ]; then \
43+
CODE_RELEASE=$(curl -sX GET "https://api.github.com/repos/cdr/code-server/releases/latest" \
44+
| awk '/tag_name/{print $4;exit}' FS='[""]'); \
45+
fi && \
46+
CODE_VERSION=$(echo "$CODE_RELEASE" | awk '{print substr($1,2); }') && \
47+
yarn --production global add code-server@"$CODE_VERSION" && \
48+
yarn cache clean && \
49+
ln -s /node_modules/.bin/code-server /usr/bin/code-server && \
50+
echo "**** clean up ****" && \
51+
apt-get purge --auto-remove -y \
52+
build-essential \
53+
libx11-dev \
54+
libxkbfile-dev \
55+
libsecret-1-dev \
56+
pkg-config && \
57+
apt-get clean && \
58+
rm -rf \
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/*
62+
63+
# add local files
64+
COPY /root /
65+
66+
# ports and volumes
67+
EXPOSE 8443

‎Jenkinsfile

Lines changed: 18 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ pipeline {
2727
DEV_DOCKERHUB_IMAGE = 'lsiodev/code-server'
2828
PR_DOCKERHUB_IMAGE = 'lspipepr/code-server'
2929
DIST_IMAGE = 'ubuntu'
30-
MULTIARCH='false'
30+
MULTIARCH='true'
3131
CI='true'
3232
CI_WEB='true'
3333
CI_PORT='8443'
@@ -138,7 +138,6 @@ pipeline {
138138
steps {
139139
script{
140140
env.IMAGE = env.DOCKERHUB_IMAGE
141-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
142141
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
143142
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
144143
if (env.MULTIARCH == 'true') {
@@ -159,7 +158,6 @@ pipeline {
159158
steps {
160159
script{
161160
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
162-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
163161
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
164162
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
165163
if (env.MULTIARCH == 'true') {
@@ -180,7 +178,6 @@ pipeline {
180178
steps {
181179
script{
182180
env.IMAGE = env.PR_DOCKERHUB_IMAGE
183-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
184181
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
185182
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
186183
if (env.MULTIARCH == 'true') {
@@ -545,22 +542,15 @@ pipeline {
545542
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
546543
usernameVariable: 'DOCKERUSER',
547544
passwordVariable: 'DOCKERPASS'
548-
],
549-
[
550-
$class: 'UsernamePasswordMultiBinding',
551-
credentialsId: 'Quay.io-Robot',
552-
usernameVariable: 'QUAYUSER',
553-
passwordVariable: 'QUAYPASS'
554545
]
555546
]) {
556547
retry(5) {
557548
sh '''#! /bin/bash
558549
set -e
559-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
560550
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
561551
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
562552
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
563-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
553+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
564554
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
565555
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
566556
docker push ${PUSHIMAGE}:latest
@@ -569,7 +559,7 @@ pipeline {
569559
'''
570560
}
571561
sh '''#! /bin/bash
572-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
562+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
573563
docker rmi \
574564
${DELETEIMAGE}:${META_TAG} \
575565
${DELETEIMAGE}:latest || :
@@ -591,18 +581,11 @@ pipeline {
591581
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
592582
usernameVariable: 'DOCKERUSER',
593583
passwordVariable: 'DOCKERPASS'
594-
],
595-
[
596-
$class: 'UsernamePasswordMultiBinding',
597-
credentialsId: 'Quay.io-Robot',
598-
usernameVariable: 'QUAYUSER',
599-
passwordVariable: 'QUAYPASS'
600584
]
601585
]) {
602586
retry(5) {
603587
sh '''#! /bin/bash
604588
set -e
605-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
606589
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
607590
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
608591
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -636,26 +619,24 @@ pipeline {
636619
docker manifest push --purge ${MANIFESTIMAGE}:latest
637620
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
638621
done
639-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
640-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
641-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
642-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
643-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
644-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
645-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
646-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
647-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
648-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
649-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
650-
docker push ${LEGACYIMAGE}:latest
651-
docker push ${LEGACYIMAGE}:${META_TAG}
652-
docker push ${LEGACYIMAGE}:arm32v7-latest
653-
docker push ${LEGACYIMAGE}:arm64v8-latest
654-
done
622+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
623+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
624+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
625+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
626+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
627+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
628+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
629+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
630+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
631+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
632+
docker push ${GITHUBIMAGE}:latest
633+
docker push ${GITHUBIMAGE}:${META_TAG}
634+
docker push ${GITHUBIMAGE}:arm32v7-latest
635+
docker push ${GITHUBIMAGE}:arm64v8-latest
655636
'''
656637
}
657638
sh '''#! /bin/bash
658-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
639+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
659640
docker rmi \
660641
${DELETEIMAGE}:amd64-${META_TAG} \
661642
${DELETEIMAGE}:amd64-latest \

0 commit comments

Comments
 (0)