diff --git a/Dockerfile b/Dockerfile index ca5c20d..06ef0a5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,10 @@ -FROM lsiobase/ubuntu:bionic as builder +FROM lsiobase/ubuntu:bionic -ARG DEBIAN_FRONTEND="noninteractive" +# set version label +ARG BUILD_DATE +ARG VERSION +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="thelamer" ARG NPM_CONFIG_UNSAFE_PERM=true RUN \ @@ -29,39 +33,3 @@ RUN \ mv \ /c9sdk \ /buildout/ - -# runtime stage -FROM lsiobase/ubuntu:bionic - -# set version label -ARG BUILD_DATE -ARG VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" - -# add files from c9base -COPY --from=builder /buildout/ / - -RUN \ - echo "**** install base packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - curl \ - git \ - gnupg \ - sudo && \ - echo "**** Cleanup and user perms ****" && \ - usermod -aG sudo \ - abc && \ - apt-get autoclean && \ - rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8000 -VOLUME /code diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index db64f13..488cca8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -1,6 +1,10 @@ -FROM lsiobase/ubuntu:arm64v8-bionic as builder +FROM lsiobase/ubuntu:arm64v8-bionic -ARG DEBIAN_FRONTEND="noninteractive" +# set version label +ARG BUILD_DATE +ARG VERSION +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="thelamer" ARG NPM_CONFIG_UNSAFE_PERM=true RUN \ @@ -29,39 +33,3 @@ RUN \ mv \ /c9sdk \ /buildout/ - -# runtime stage -FROM lsiobase/ubuntu:arm64v8-bionic - -# set version label -ARG BUILD_DATE -ARG VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" - -# add files from c9base -COPY --from=builder /buildout/ / - -RUN \ - echo "**** install base packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - curl \ - git \ - gnupg \ - sudo && \ - echo "**** Cleanup and user perms ****" && \ - usermod -aG sudo \ - abc && \ - apt-get autoclean && \ - rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8000 -VOLUME /code diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 35ed75c..00fff6c 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -1,6 +1,10 @@ -FROM lsiobase/ubuntu:arm32v7-bionic as builder +FROM lsiobase/ubuntu:arm32v7-bionic -ARG DEBIAN_FRONTEND="noninteractive" +# set version label +ARG BUILD_DATE +ARG VERSION +LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" +LABEL maintainer="thelamer" ARG NPM_CONFIG_UNSAFE_PERM=true RUN \ @@ -29,39 +33,3 @@ RUN \ mv \ /c9sdk \ /buildout/ - -# runtime stage -FROM lsiobase/ubuntu:arm32v7-bionic - -# set version label -ARG BUILD_DATE -ARG VERSION -LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}" -LABEL maintainer="thelamer" - -# add files from c9base -COPY --from=builder /buildout/ / - -RUN \ - echo "**** install base packages ****" && \ - apt-get update && \ - apt-get install -y --no-install-recommends \ - curl \ - git \ - gnupg \ - sudo && \ - echo "**** Cleanup and user perms ****" && \ - usermod -aG sudo \ - abc && \ - apt-get autoclean && \ - rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* \ - /tmp/* - -# add local files -COPY root/ / - -# ports and volumes -EXPOSE 8000 -VOLUME /code diff --git a/Jenkinsfile b/Jenkinsfile index ed64e8d..e38a77f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -23,7 +23,7 @@ pipeline { DIST_IMAGE = 'ubuntu' MULTIARCH='true' CI='true' - CI_WEB='true' + CI_WEB='false' CI_PORT='8000' CI_SSL='false' CI_DELAY='120' @@ -38,7 +38,7 @@ pipeline { script{ env.EXIT_STATUS = '' env.LS_RELEASE = sh( - 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' || : ''', + 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' || : ''', returnStdout: true).trim() env.LS_RELEASE_NOTES = sh( 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 { } } } - // If this is a master build use live docker endpoints + // If this is a files build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' } steps { @@ -151,7 +151,7 @@ pipeline { // If this is a dev build use dev docker endpoints stage("Set ENV dev build"){ when { - not {branch "master"} + not {branch "files"} environment name: 'CHANGE_ID', value: '' } steps { @@ -218,7 +218,7 @@ pipeline { // Use helper containers to render templated files stage('Update-Templates') { when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' expression { env.CONTAINER_NAME != null @@ -229,15 +229,15 @@ pipeline { set -e TEMPDIR=$(mktemp -d) docker pull linuxserver/jenkins-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=files -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest docker pull linuxserver/doc-builder:latest - docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=master -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest + docker run --rm -e CONTAINER_NAME=${CONTAINER_NAME} -e GITHUB_BRANCH=files -v ${TEMPDIR}:/ansible/readme linuxserver/doc-builder:latest if [ "$(md5sum ${TEMPDIR}/${LS_REPO}/Jenkinsfile | awk '{ print $1 }')" != "$(md5sum Jenkinsfile | awk '{ print $1 }')" ] || \ [ "$(md5sum ${TEMPDIR}/${CONTAINER_NAME}/README.md | awk '{ print $1 }')" != "$(md5sum README.md | awk '{ print $1 }')" ] || \ [ "$(cat ${TEMPDIR}/${LS_REPO}/LICENSE | md5sum | cut -c1-8)" != "${LICENSE_TAG}" ]; then mkdir -p ${TEMPDIR}/repo git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO} - git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/repo/${LS_REPO}/.git checkout -f files cp ${TEMPDIR}/${CONTAINER_NAME}/README.md ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/Jenkinsfile ${TEMPDIR}/repo/${LS_REPO}/ cp ${TEMPDIR}/docker-${CONTAINER_NAME}/LICENSE ${TEMPDIR}/repo/${LS_REPO}/ @@ -269,7 +269,7 @@ pipeline { // Exit the build if the Templated files were just updated stage('Template-exit') { when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' environment name: 'FILES_UPDATED', value: 'true' expression { @@ -368,7 +368,7 @@ pipeline { // Take the image we just built and dump package versions for comparison stage('Update-packages') { when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' environment name: 'EXIT_STATUS', value: '' } @@ -396,7 +396,7 @@ pipeline { echo "Package tag sha from current packages in buit container is ${NEW_PACKAGE_TAG} comparing to old ${PACKAGE_TAG} from github" if [ "${NEW_PACKAGE_TAG}" != "${PACKAGE_TAG}" ]; then git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/${LS_REPO} - git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f master + git --git-dir ${TEMPDIR}/${LS_REPO}/.git checkout -f files cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/ cd ${TEMPDIR}/${LS_REPO}/ wait @@ -420,7 +420,7 @@ pipeline { // Exit the build if the package file was just updated stage('PACKAGE-exit') { when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'true' environment name: 'EXIT_STATUS', value: '' @@ -434,7 +434,7 @@ pipeline { // Exit the build if this is just a package check and there are no changes to push stage('PACKAGECHECK-exit') { when { - branch "master" + branch "files" environment name: 'CHANGE_ID', value: '' environment name: 'PACKAGE_UPDATED', value: 'false' environment name: 'EXIT_STATUS', value: '' @@ -518,12 +518,12 @@ pipeline { sh '''#! /bin/bash echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin ''' - sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:latest" - sh "docker push ${IMAGE}:latest" + sh "docker tag ${IMAGE}:${META_TAG} ${IMAGE}:files" + sh "docker push ${IMAGE}:files" sh "docker push ${IMAGE}:${META_TAG}" sh '''docker rmi \ ${IMAGE}:${META_TAG} \ - ${IMAGE}:latest || :''' + ${IMAGE}:files || :''' } } @@ -553,24 +553,24 @@ pipeline { docker tag lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm32v7-${META_TAG} docker tag lsiodev/buildcache:arm64v8-${COMMIT_SHA}-${BUILD_NUMBER} ${IMAGE}:arm64v8-${META_TAG} fi''' - sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-latest" - sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-latest" - sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-latest" + sh "docker tag ${IMAGE}:amd64-${META_TAG} ${IMAGE}:amd64-files" + sh "docker tag ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm32v7-files" + sh "docker tag ${IMAGE}:arm64v8-${META_TAG} ${IMAGE}:arm64v8-files" sh "docker push ${IMAGE}:amd64-${META_TAG}" sh "docker push ${IMAGE}:arm32v7-${META_TAG}" sh "docker push ${IMAGE}:arm64v8-${META_TAG}" - sh "docker push ${IMAGE}:amd64-latest" - sh "docker push ${IMAGE}:arm32v7-latest" - sh "docker push ${IMAGE}:arm64v8-latest" - sh "docker manifest push --purge ${IMAGE}:latest || :" - sh "docker manifest create ${IMAGE}:latest ${IMAGE}:amd64-latest ${IMAGE}:arm32v7-latest ${IMAGE}:arm64v8-latest" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm32v7-latest --os linux --arch arm" - sh "docker manifest annotate ${IMAGE}:latest ${IMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8" + sh "docker push ${IMAGE}:amd64-files" + sh "docker push ${IMAGE}:arm32v7-files" + sh "docker push ${IMAGE}:arm64v8-files" + sh "docker manifest push --purge ${IMAGE}:files || :" + sh "docker manifest create ${IMAGE}:files ${IMAGE}:amd64-files ${IMAGE}:arm32v7-files ${IMAGE}:arm64v8-files" + sh "docker manifest annotate ${IMAGE}:files ${IMAGE}:arm32v7-files --os linux --arch arm" + sh "docker manifest annotate ${IMAGE}:files ${IMAGE}:arm64v8-files --os linux --arch arm64 --variant v8" sh "docker manifest push --purge ${IMAGE}:${META_TAG} || :" sh "docker manifest create ${IMAGE}:${META_TAG} ${IMAGE}:amd64-${META_TAG} ${IMAGE}:arm32v7-${META_TAG} ${IMAGE}:arm64v8-${META_TAG}" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm32v7-${META_TAG} --os linux --arch arm" sh "docker manifest annotate ${IMAGE}:${META_TAG} ${IMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8" - sh "docker manifest push --purge ${IMAGE}:latest" + sh "docker manifest push --purge ${IMAGE}:files" sh "docker manifest push --purge ${IMAGE}:${META_TAG}" } } @@ -578,7 +578,7 @@ pipeline { // If this is a public release tag it in the LS Github stage('Github-Tag-Push-Release') { when { - branch "master" + branch "files" expression { env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER } @@ -590,17 +590,17 @@ pipeline { sh '''curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/git/tags \ -d '{"tag":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "object": "'${COMMIT_SHA}'",\ - "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to master",\ + "message": "Tagging Release '${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}' to files",\ "type": "commit",\ "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' ''' echo "Pushing New release for Tag" sh '''#! /bin/bash curl -s https://api.github.com/repos/${EXT_USER}/${EXT_REPO}/commits/${EXT_GIT_BRANCH} | jq '. | .commit.message' | sed 's:^.\\(.*\\).$:\\1:' > releasebody.json echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ - "target_commitish": "master",\ + "target_commitish": "files",\ "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\ "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**'${EXT_REPO}' Changes:**\\n\\n' > start - printf '","draft": false,"prerelease": false}' >> releasebody.json + printf '","draft": false,"prerelease": true}' >> releasebody.json paste -d'\\0' start releasebody.json > releasebody.json.done curl -H "Authorization: token ${GITHUB_TOKEN}" -X POST https://api.github.com/repos/${LS_USER}/${LS_REPO}/releases -d @releasebody.json.done''' } diff --git a/jenkins-vars.yml b/jenkins-vars.yml index f85e549..d312318 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -3,9 +3,9 @@ # jenkins variables project_name: docker-baseimage-cloud9 external_type: github_commit -release_type: stable -release_tag: latest -ls_branch: master +release_type: prerelease +release_tag: files +ls_branch: files repo_vars: - EXT_GIT_BRANCH = 'master' - EXT_USER = 'c9' @@ -20,7 +20,7 @@ repo_vars: - DIST_IMAGE = 'ubuntu' - MULTIARCH='true' - CI='true' - - CI_WEB='true' + - CI_WEB='false' - CI_PORT='8000' - CI_SSL='false' - CI_DELAY='120' diff --git a/root/etc/cont-init.d/30-config b/root/etc/cont-init.d/30-config deleted file mode 100644 index e5f8973..0000000 --- a/root/etc/cont-init.d/30-config +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/with-contenv bash - -# check for lock file to only run git operations once -if [ ! -e /lock.file ]; then - # give abc a sudo shell for development - chsh abc -s /bin/bash - sed -e 's/%sudo ALL=(ALL:ALL) ALL/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' \ - -i /etc/sudoers - sed -e 's/^wheel:\(.*\)/wheel:\1,abc/g' -i /etc/group - # create directory for project - mkdir -p /code - # make sure URL is set and folder is empty to clone code - if [ ${GITURL+x} ] && [ ! "$(/bin/ls -A /code 2>/dev/null)" ] ; then \ - # clone the url the user passed to this directory - git clone "${GITURL}" /code - fi -else - # lock exists not importing project this is a restart - echo "Lock exists just starting cloud9" -fi - -# create lock file after first run -touch /lock.file - -# permissions -mkdir -p /c9sdk/build/standalone -echo "[cont-init.d] Setting permissions this may take some time" -chown -R abc:abc \ - /c9sdk/build/standalone \ - /code \ - /c9bins/.c9 diff --git a/root/etc/services.d/c9/run b/root/etc/services.d/c9/run deleted file mode 100644 index 828e3a2..0000000 --- a/root/etc/services.d/c9/run +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/with-contenv bash - -cd /c9sdk -HOME=/c9bins exec \ - s6-setuidgid abc \ - /c9bins/.c9/node/bin/node server.js --listen 0.0.0.0 -p 8000 -w /code -a :