adding i3 focal flavor

2026-02-20 06:16:43 +08:00 · 2020-03-16 17:47:34 -07:00 · 2020-03-16 17:47:34 -07:00 · 5a1a422690
commit 5a1a422690
parent 1354ce6d96
8 changed files with 55 additions and 95 deletions
--- a/10
+++ b/10
@ -10,13 +10,11 @@ RUN \
 echo "**** install packages ****" && \
 apt-get update && \
 DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
 echo "**** cleanup ****" && \
 apt-get autoclean && \
 rm -rf \
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@ -10,13 +10,11 @@ RUN \
 echo "**** install packages ****" && \
 apt-get update && \
 DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
 echo "**** cleanup ****" && \
 apt-get autoclean && \
 rm -rf \
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@ -10,13 +10,11 @@ RUN \
 echo "**** install packages ****" && \
 apt-get update && \
 DEBIAN_FRONTEND=noninteractive \
- apt-get install --no-install-recommends -y \
+ apt-get install -y \
 	firefox \
-	terminator \
-	xfce4 \
-	xfce4-goodies \
-	xubuntu-default-settings \
-	xubuntu-icon-theme && \
+	i3 \
+	i3status \
+	terminator && \
 echo "**** cleanup ****" && \
 apt-get autoclean && \
 rm -rf \
--- a/78
+++ b/78
@ -41,7 +41,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}':i3-focal 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' ''',
@ -117,10 +117,10 @@ pipeline {
        }
      }
    }
-    // If this is a master build use live docker endpoints
+    // If this is a i3-focal build use live docker endpoints
    stage("Set ENV live build"){
      when {
-        branch "master"
+        branch "i3-focal"
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@ -141,7 +141,7 @@ pipeline {
    // If this is a dev build use dev docker endpoints
    stage("Set ENV dev build"){
      when {
-        not {branch "master"}
+        not {branch "i3-focal"}
        environment name: 'CHANGE_ID', value: ''
      }
      steps {
@ -214,7 +214,7 @@ pipeline {
    // Use helper containers to render templated files
    stage('Update-Templates') {
      when {
-        branch "master"
+        branch "i3-focal"
        environment name: 'CHANGE_ID', value: ''
        expression {
          env.CONTAINER_NAME != null
@ -225,7 +225,7 @@ 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=i3-focal -v ${TEMPDIR}:/ansible/jenkins linuxserver/jenkins-builder:latest 
              CURRENTHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
              cd ${TEMPDIR}/docker-${CONTAINER_NAME}
              NEWHASH=$(grep -hs ^ ${TEMPLATED_FILES} | md5sum | cut -c1-8)
@ -233,7 +233,7 @@ pipeline {
                mkdir -p ${TEMPDIR}/repo
                git clone https://github.com/${LS_USER}/${LS_REPO}.git ${TEMPDIR}/repo/${LS_REPO}
                cd ${TEMPDIR}/repo/${LS_REPO}
-                git checkout -f master
+                git checkout -f i3-focal
                cd ${TEMPDIR}/docker-${CONTAINER_NAME}
                mkdir -p ${TEMPDIR}/repo/${LS_REPO}/.github
                cp --parents ${TEMPLATED_FILES} ${TEMPDIR}/repo/${LS_REPO}/
@ -265,7 +265,7 @@ pipeline {
    // Exit the build if the Templated files were just updated
    stage('Template-exit') {
      when {
-        branch "master"
+        branch "i3-focal"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'FILES_UPDATED', value: 'true'
        expression {
@ -384,7 +384,7 @@ pipeline {
    // Take the image we just built and dump package versions for comparison
    stage('Update-packages') {
      when {
-        branch "master"
+        branch "i3-focal"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'EXIT_STATUS', value: ''
      }
@ -412,7 +412,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 i3-focal
                cp ${TEMPDIR}/package_versions.txt ${TEMPDIR}/${LS_REPO}/
                cd ${TEMPDIR}/${LS_REPO}/
                wait
@ -436,7 +436,7 @@ pipeline {
    // Exit the build if the package file was just updated
    stage('PACKAGE-exit') {
      when {
-        branch "master"
+        branch "i3-focal"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'true'
        environment name: 'EXIT_STATUS', value: ''
@ -450,7 +450,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 "i3-focal"
        environment name: 'CHANGE_ID', value: ''
        environment name: 'PACKAGE_UPDATED', value: 'false'
        environment name: 'EXIT_STATUS', value: ''
@ -545,14 +545,14 @@ pipeline {
                echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
                for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                  docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
-                  docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
-                  docker push ${PUSHIMAGE}:latest
+                  docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:i3-focal
+                  docker push ${PUSHIMAGE}:i3-focal
                  docker push ${PUSHIMAGE}:${META_TAG}
                done
                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:${META_TAG} \
-                  ${DELETEIMAGE}:latest || :
+                  ${DELETEIMAGE}:i3-focal || :
                done
             '''
        }
@ -595,52 +595,52 @@ pipeline {
                  docker tag ${IMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG}
                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-latest
-                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-latest
-                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-latest
+                  docker tag ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:amd64-i3-focal
+                  docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-i3-focal
+                  docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-i3-focal
                  docker push ${MANIFESTIMAGE}:amd64-${META_TAG}
                  docker push ${MANIFESTIMAGE}:arm32v7-${META_TAG}
                  docker push ${MANIFESTIMAGE}:arm64v8-${META_TAG}
-                  docker push ${MANIFESTIMAGE}:amd64-latest
-                  docker push ${MANIFESTIMAGE}:arm32v7-latest
-                  docker push ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest push --purge ${MANIFESTIMAGE}:latest || :
-                  docker manifest create ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:amd64-latest ${MANIFESTIMAGE}:arm32v7-latest ${MANIFESTIMAGE}:arm64v8-latest
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm32v7-latest --os linux --arch arm
-                  docker manifest annotate ${MANIFESTIMAGE}:latest ${MANIFESTIMAGE}:arm64v8-latest --os linux --arch arm64 --variant v8
+                  docker push ${MANIFESTIMAGE}:amd64-i3-focal
+                  docker push ${MANIFESTIMAGE}:arm32v7-i3-focal
+                  docker push ${MANIFESTIMAGE}:arm64v8-i3-focal
+                  docker manifest push --purge ${MANIFESTIMAGE}:i3-focal || :
+                  docker manifest create ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:amd64-i3-focal ${MANIFESTIMAGE}:arm32v7-i3-focal ${MANIFESTIMAGE}:arm64v8-i3-focal
+                  docker manifest annotate ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:arm32v7-i3-focal --os linux --arch arm
+                  docker manifest annotate ${MANIFESTIMAGE}:i3-focal ${MANIFESTIMAGE}:arm64v8-i3-focal --os linux --arch arm64 --variant v8
                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} || :
                  docker manifest create ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:amd64-${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG}
                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm32v7-${META_TAG} --os linux --arch arm
                  docker manifest annotate ${MANIFESTIMAGE}:${META_TAG} ${MANIFESTIMAGE}:arm64v8-${META_TAG} --os linux --arch arm64 --variant v8
-                  docker manifest push --purge ${MANIFESTIMAGE}:latest
+                  docker manifest push --purge ${MANIFESTIMAGE}:i3-focal
                  docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG} 
                done
                for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
                  docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
                  docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
                  docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
+                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:i3-focal
                  docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
-                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
-                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
+                  docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-i3-focal
+                  docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-i3-focal
                  docker push ${LEGACYIMAGE}:amd64-${META_TAG}
                  docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
                  docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
-                  docker push ${LEGACYIMAGE}:latest
+                  docker push ${LEGACYIMAGE}:i3-focal
                  docker push ${LEGACYIMAGE}:${META_TAG}
-                  docker push ${LEGACYIMAGE}:arm32v7-latest
-                  docker push ${LEGACYIMAGE}:arm64v8-latest
+                  docker push ${LEGACYIMAGE}:arm32v7-i3-focal
+                  docker push ${LEGACYIMAGE}:arm64v8-i3-focal
                done
             '''
          sh '''#! /bin/bash
                for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
                  docker rmi \
                  ${DELETEIMAGE}:amd64-${META_TAG} \
-                  ${DELETEIMAGE}:amd64-latest \
+                  ${DELETEIMAGE}:amd64-i3-focal \
                  ${DELETEIMAGE}:arm32v7-${META_TAG} \
-                  ${DELETEIMAGE}:arm32v7-latest \
+                  ${DELETEIMAGE}:arm32v7-i3-focal \
                  ${DELETEIMAGE}:arm64v8-${META_TAG} \
-                  ${DELETEIMAGE}:arm64v8-latest || :
+                  ${DELETEIMAGE}:arm64v8-i3-focal || :
                done
                docker rmi \
                lsiodev/buildcache:arm32v7-${COMMIT_SHA}-${BUILD_NUMBER} \
@ -652,7 +652,7 @@ pipeline {
    // If this is a public release tag it in the LS Github
    stage('Github-Tag-Push-Release') {
      when {
-        branch "master"
+        branch "i3-focal"
        expression {
          env.LS_RELEASE != env.EXT_RELEASE_CLEAN + '-ls' + env.LS_TAG_NUMBER
        }
@ -664,17 +664,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 i3-focal",\
             "type": "commit",\
             "tagger": {"name": "LinuxServer Jenkins","email": "jenkins@linuxserver.io","date": "'${GITHUB_DATE}'"}}' '''
        echo "Pushing New release for Tag"
        sh '''#! /bin/bash
              echo "Updating base packages to ${PACKAGE_TAG}" > releasebody.json
              echo '{"tag_name":"'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
-                     "target_commitish": "master",\
+                     "target_commitish": "i3-focal",\
                     "name": "'${EXT_RELEASE_CLEAN}'-ls'${LS_TAG_NUMBER}'",\
                     "body": "**LinuxServer Changes:**\\n\\n'${LS_RELEASE_NOTES}'\\n**OS 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'''
      }
--- a/README.md
+++ b/README.md
@ -55,24 +55,6 @@ The architectures supported by this image are:
 | arm64 | arm64v8-latest |
 | armhf | arm32v7-latest |

-## Version Tags
-
-This image provides various versions that are available via tags. `latest` tag usually provides the latest stable version. Others are considered under development and caution must be exercised when using them.
-
-| Tag | Description |
-| :----: | --- |
-| latest | XFCE Focal |
-| xfce-bionic | XFCE Bionic |
-| kde-focal | KDE Focal |
-| kde-bionic | KDE Bionic |
-| lxde-focal | LXDE Focal |
-| lxde-bionic | LXDE Bionic |
-| budgie-focal | Budgie Focal |
-| budgie-bionic | Budgie Bionic |
-| mate-focal | MATE Focal |
-| mate-bionic | MATE Bionic |
-| kylin-focal | Kylin Focal |
-| kylin-bionic | Kylin Bionic |

 ## Usage

--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@ -3,9 +3,9 @@
 # jenkins variables
 project_name: docker-rdesktop
 external_type: os
-release_type: stable
-release_tag: latest
-ls_branch: master
+release_type: prerelease
+release_tag: i3-focal
+ls_branch: i3-focal
 repo_vars:
  - BUILD_VERSION_ARG = 'OS_VERSION'
  - LS_USER = 'linuxserver'
--- a/readme-vars.yml
+++ b/readme-vars.yml
@ -14,22 +14,6 @@ available_architectures:
  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
  - { arch: "{{ arch_armhf }}", tag: "arm32v7-latest"}

-# development version
-development_versions: true
-development_versions_items:
-  - { tag: "latest", desc: "XFCE Focal" }
-  - { tag: "xfce-bionic", desc: "XFCE Bionic" }
-  - { tag: "kde-focal", desc: "KDE Focal" }
-  - { tag: "kde-bionic", desc: "KDE Bionic" }
-  - { tag: "lxde-focal", desc: "LXDE Focal" }
-  - { tag: "lxde-bionic", desc: "LXDE Bionic" }
-  - { tag: "budgie-focal", desc: "Budgie Focal" }
-  - { tag: "budgie-bionic", desc: "Budgie Bionic" }
-  - { tag: "mate-focal", desc: "MATE Focal" }
-  - { tag: "mate-bionic", desc: "MATE Bionic" }
-  - { tag: "kylin-focal", desc: "Kylin Focal" }
-  - { tag: "kylin-bionic", desc: "Kylin Bionic" }
-
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: false
--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
@ -1,2 +1,2 @@
 #!/bin/bash
-/usr/bin/startxfce4 > /dev/null 2>&1
+/usr/bin/i3 > /dev/null 2>&1