Skip to content
This repository was archived by the owner on Oct 10, 2022. It is now read-only.

Commit 581fc60

Browse files
thelamerthelamer
committed
files branch for stashing compiled verison of cloud9 sdk
1 parent df41139 commit 581fc60

File tree

7 files changed

+54
-187
lines changed

7 files changed

+54
-187
lines changed

‎Dockerfile‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
FROM lsiobase/ubuntu:bionic as builder
1+
FROM lsiobase/ubuntu:bionic
22

3-
ARG DEBIAN_FRONTEND="noninteractive"
3+
# set version label
4+
ARG BUILD_DATE
5+
ARG VERSION
6+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="thelamer"
48
ARG NPM_CONFIG_UNSAFE_PERM=true
59

610
RUN \
@@ -29,39 +33,3 @@ RUN \
2933
mv \
3034
/c9sdk \
3135
/buildout/
32-
33-
# runtime stage
34-
FROM lsiobase/ubuntu:bionic
35-
36-
# set version label
37-
ARG BUILD_DATE
38-
ARG VERSION
39-
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
40-
LABEL maintainer="thelamer"
41-
42-
# add files from c9base
43-
COPY --from=builder /buildout/ /
44-
45-
RUN \
46-
echo "**** install base packages ****" && \
47-
apt-get update && \
48-
apt-get install -y --no-install-recommends \
49-
curl \
50-
git \
51-
gnupg \
52-
sudo && \
53-
echo "**** Cleanup and user perms ****" && \
54-
usermod -aG sudo \
55-
abc && \
56-
apt-get autoclean && \
57-
rm -rf \
58-
/var/lib/apt/lists/* \
59-
/var/tmp/* \
60-
/tmp/*
61-
62-
# add local files
63-
COPY root/ /
64-
65-
# ports and volumes
66-
EXPOSE 8000
67-
VOLUME /code

‎Dockerfile.aarch64‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
FROM lsiobase/ubuntu:arm64v8-bionic as builder
1+
FROM lsiobase/ubuntu:arm64v8-bionic
22

3-
ARG DEBIAN_FRONTEND="noninteractive"
3+
# set version label
4+
ARG BUILD_DATE
5+
ARG VERSION
6+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="thelamer"
48
ARG NPM_CONFIG_UNSAFE_PERM=true
59

610
RUN \
@@ -29,39 +33,3 @@ RUN \
2933
mv \
3034
/c9sdk \
3135
/buildout/
32-
33-
# runtime stage
34-
FROM lsiobase/ubuntu:arm64v8-bionic
35-
36-
# set version label
37-
ARG BUILD_DATE
38-
ARG VERSION
39-
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
40-
LABEL maintainer="thelamer"
41-
42-
# add files from c9base
43-
COPY --from=builder /buildout/ /
44-
45-
RUN \
46-
echo "**** install base packages ****" && \
47-
apt-get update && \
48-
apt-get install -y --no-install-recommends \
49-
curl \
50-
git \
51-
gnupg \
52-
sudo && \
53-
echo "**** Cleanup and user perms ****" && \
54-
usermod -aG sudo \
55-
abc && \
56-
apt-get autoclean && \
57-
rm -rf \
58-
/var/lib/apt/lists/* \
59-
/var/tmp/* \
60-
/tmp/*
61-
62-
# add local files
63-
COPY root/ /
64-
65-
# ports and volumes
66-
EXPOSE 8000
67-
VOLUME /code

‎Dockerfile.armhf‎

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
FROM lsiobase/ubuntu:arm32v7-bionic as builder
1+
FROM lsiobase/ubuntu:arm32v7-bionic
22

3-
ARG DEBIAN_FRONTEND="noninteractive"
3+
# set version label
4+
ARG BUILD_DATE
5+
ARG VERSION
6+
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
7+
LABEL maintainer="thelamer"
48
ARG NPM_CONFIG_UNSAFE_PERM=true
59

610
RUN \
@@ -29,39 +33,3 @@ RUN \
2933
mv \
3034
/c9sdk \
3135
/buildout/
32-
33-
# runtime stage
34-
FROM lsiobase/ubuntu:arm32v7-bionic
35-
36-
# set version label
37-
ARG BUILD_DATE
38-
ARG VERSION
39-
LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
40-
LABEL maintainer="thelamer"
41-
42-
# add files from c9base
43-
COPY --from=builder /buildout/ /
44-
45-
RUN \
46-
echo "**** install base packages ****" && \
47-
apt-get update && \
48-
apt-get install -y --no-install-recommends \
49-
curl \
50-
git \
51-
gnupg \
52-
sudo && \
53-
echo "**** Cleanup and user perms ****" && \
54-
usermod -aG sudo \
55-
abc && \
56-
apt-get autoclean && \
57-
rm -rf \
58-
/var/lib/apt/lists/* \
59-
/var/tmp/* \
60-
/tmp/*
61-
62-
# add local files
63-
COPY root/ /
64-
65-
# ports and volumes
66-
EXPOSE 8000
67-
VOLUME /code

‎Jenkinsfile‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ pipeline {
2323
DIST_IMAGE = 'ubuntu'
2424
MULTIARCH='true'
2525
CI='true'
26-
CI_WEB='true'
26+
CI_WEB='false'
2727
CI_PORT='8000'
2828
CI_SSL='false'
2929
CI_DELAY='120'
@@ -38,7 +38,7 @@ pipeline {
3838
script{
3939
env.EXIT_STATUS = ''
4040
env.LS_RELEASE = sh(
41-
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':latest 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
41+
script: '''docker run --rm alexeiled/skopeo sh -c 'skopeo inspect docker://docker.io/'${DOCKERHUB_IMAGE}':files 2>/dev/null' | jq -r '.Labels.build_version' | awk '{print $3}' | grep '\\-ls' || : ''',
4242
returnStdout: true).trim()
4343
env.LS_RELEASE_NOTES = sh(
4444
script: '''cat readme-vars.yml | awk -F \\" '/date: "[0-9][0-9].[0-9][0-9].[0-9][0-9]:/ {print $4;exit;}' | sed -E ':a;N;$!ba;s/\\r{0,1}\\n/\\\\n/g' ''',
@@ -130,10 +130,10 @@ pipeline {
130130
}
131131
}
132132
}
133-
// If this is a master build use live docker endpoints
133+
// If this is a files build use live docker endpoints
134134
stage("Set ENV live build"){
135135
when {
136-
branch "master"
136+
branch "files"
137137
environment name: 'CHANGE_ID', value: ''
138138
}
139139
steps {
@@ -151,7 +151,7 @@ pipeline {
151151
// If this is a dev build use dev docker endpoints
152152
stage("Set ENV dev build"){
153153
when {
154-
not {branch "master"}
154+
not {branch "files"}
155155
environment name: 'CHANGE_ID', value: ''
156156
}
157157
steps {
@@ -218,7 +218,7 @@ pipeline {
218218
// Use helper containers to render templated files
219219
stage('Update-Templates') {
220220
when {
221-
branch "master"
221+
branch "files"
222222
environment name: 'CHANGE_ID', value: ''
223223
expression {
224224
env.CONTAINER_NAME != null
@@ -229,15 +229,15 @@ pipeline {
229229
set -e
230230
TEMPDIR=$(mktemp -d)
231231
docker pull linuxserver/jenkins-builder:latest
232-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
232+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=files -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest
233233
docker pull linuxserver/doc-builder:latest
234-
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
234+
docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=files -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest
235235
if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \
236236
[ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \
237237
[ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then
238238
mkdir -p ${TEMPDIR}/repo
239239
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
240-
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master
240+
git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f files
241241
cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/
242242
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/
243243
cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/
@@ -269,7 +269,7 @@ pipeline {
269269
// Exit the build if the Templated files were just updated
270270
stage('Template-exit') {
271271
when {
272-
branch "master"
272+
branch "files"
273273
environment name: 'CHANGE_ID', value: ''
274274
environment name: 'FILES_UPDATED', value: 'true'
275275
expression {
@@ -368,7 +368,7 @@ pipeline {
368368
// Take the image we just built and dump package versions for comparison
369369
stage('Update-packages') {
370370
when {
371-
branch "master"
371+
branch "files"
372372
environment name: 'CHANGE_ID', value: ''
373373
environment name: 'EXIT_STATUS', value: ''
374374
}
@@ -396,7 +396,7 @@ pipeline {
396396
echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github"
397397
if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then
398398
git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO}
399-
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master
399+
git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f files
400400
cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
401401
cd ${TEMPDIR}/${LS_REPO}/
402402
wait
@@ -420,7 +420,7 @@ pipeline {
420420
// Exit the build if the package file was just updated
421421
stage('PACKAGE-exit') {
422422
when {
423-
branch "master"
423+
branch "files"
424424
environment name: 'CHANGE_ID', value: ''
425425
environment name: 'PACKAGE_UPDATED', value: 'true'
426426
environment name: 'EXIT_STATUS', value: ''
@@ -434,7 +434,7 @@ pipeline {
434434
// Exit the build if this is just a package check and there are no changes to push
435435
stage('PACKAGECHECK-exit') {
436436
when {
437-
branch "master"
437+
branch "files"
438438
environment name: 'CHANGE_ID', value: ''
439439
environment name: 'PACKAGE_UPDATED', value: 'false'
440440
environment name: 'EXIT_STATUS', value: ''
@@ -518,12 +518,12 @@ pipeline {
518518
sh '''#! /bin/bash
519519
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
520520
'''
521-
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest"
522-
sh "docker push ${IMAGE}:latest"
521+
sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:files"
522+
sh "docker push ${IMAGE}:files"
523523
sh "docker push ${IMAGE}:${META_TAG}"
524524
sh '''docker rmi \
525525
${IMAGE}:${META_TAG} \
526-
${IMAGE}:latest || :'''
526+
${IMAGE}:files || :'''
527527

528528
}
529529
}
@@ -553,32 +553,32 @@ pipeline {
553553
docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG}
554554
docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG}
555555
fi'''
556-
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest"
557-
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest"
558-
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest"
556+
sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-files"
557+
sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-files"
558+
sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-files"
559559
sh "docker push ${IMAGE}:amd64-${META_TAG}"
560560
sh "docker push ${IMAGE}:arm32v7-${META_TAG}"
561561
sh "docker push ${IMAGE}:arm64v8-${META_TAG}"
562-
sh "docker push ${IMAGE}:amd64-latest"
563-
sh "docker push ${IMAGE}:arm32v7-latest"
564-
sh "docker push ${IMAGE}:arm64v8-latest"
565-
sh "docker manifest push --purge ${IMAGE}:latest || :"
566-
sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest"
567-
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm"
568-
sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8"
562+
sh "docker push ${IMAGE}:amd64-files"
563+
sh "docker push ${IMAGE}:arm32v7-files"
564+
sh "docker push ${IMAGE}:arm64v8-files"
565+
sh "docker manifest push --purge ${IMAGE}:files || :"
566+
sh "docker manifest create ${IMAGE}:files ${IMAGE}:amd64-files ${IMAGE}:arm32v7-files ${IMAGE}:arm64v8-files"
567+
sh "docker manifest annotate ${IMAGE}:files ${IMAGE}:arm32v7-files --os linux --arch arm"
568+
sh "docker manifest annotate ${IMAGE}:files ${IMAGE}:arm64v8-files --os linux --arch arm64 --variant v8"
569569
sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :"
570570
sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}"
571571
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm"
572572
sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8"
573-
sh "docker manifest push --purge ${IMAGE}:latest"
573+
sh "docker manifest push --purge ${IMAGE}:files"
574574
sh "docker manifest push --purge ${IMAGE}:${META_TAG}"
575575
}
576576
}
577577
}
578578
// If this is a public release tag it in the LS Github
579579
stage('Github-Tag-Push-Release') {
580580
when {
581-
branch "master"
581+
branch "files"
582582
expression {
583583
env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
584584
}
@@ -590,17 +590,17 @@ pipeline {
590590
sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \
591591
-d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
592592
"object": "'${COMMIT_SHA}'",\
593-
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\
593+
"message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to files",\
594594
"type": "commit",\
595595
"tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
596596
echo "Pushing New release for Tag"
597597
sh '''#! /bin/bash
598598
curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json
599599
echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
600-
"target_commitish": "master",\
600+
"target_commitish": "files",\
601601
"name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
602602
"body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start
603-
printf '","draft": false,"prerelease": false}' >> releasebody.json
603+
printf '","draft": false,"prerelease": true}' >> releasebody.json
604604
paste -d'\\0' start releasebody.json > releasebody.json.done
605605
curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done'''
606606
}

‎jenkins-vars.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
# jenkins variables
44
project_name: docker-baseimage-cloud9
55
external_type: github_commit
6-
release_type: stable
7-
release_tag: latest
8-
ls_branch: master
6+
release_type: prerelease
7+
release_tag: files
8+
ls_branch: files
99
repo_vars:
1010
- EXT_GIT_BRANCH = 'master'
1111
- EXT_USER = 'c9'
@@ -20,7 +20,7 @@ repo_vars:
2020
- DIST_IMAGE = 'ubuntu'
2121
- MULTIARCH='true'
2222
- CI='true'
23-
- CI_WEB='true'
23+
- CI_WEB='false'
2424
- CI_PORT='8000'
2525
- CI_SSL='false'
2626
- CI_DELAY='120'

0 commit comments

Comments
 (0)