diff --git a/Dockerfile b/Dockerfile index 051706c9..3b5205ed 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,13 @@ RUN \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ firefox \ + mate-applets \ + mate-applet-brisk-menu \ terminator \ - xfce4 \ - xfce4-goodies \ - xubuntu-default-settings \ - xubuntu-icon-theme && \ + ubuntu-mate-artwork \ + ubuntu-mate-default-settings \ + ubuntu-mate-desktop \ + ubuntu-mate-icon-themes && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f9710593..6a304113 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -12,11 +12,13 @@ RUN \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ firefox \ + mate-applets \ + mate-applet-brisk-menu \ terminator \ - xfce4 \ - xfce4-goodies \ - xubuntu-default-settings \ - xubuntu-icon-theme && \ + ubuntu-mate-artwork \ + ubuntu-mate-default-settings \ + ubuntu-mate-desktop \ + ubuntu-mate-icon-themes && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Dockerfile.armhf b/Dockerfile.armhf index 7975213d..e20506a6 100644 --- a/Dockerfile.armhf +++ b/Dockerfile.armhf @@ -12,11 +12,13 @@ RUN \ DEBIAN_FRONTEND=noninteractive \ apt-get install --no-install-recommends -y \ firefox \ + mate-applets \ + mate-applet-brisk-menu \ terminator \ - xfce4 \ - xfce4-goodies \ - xubuntu-default-settings \ - xubuntu-icon-theme && \ + ubuntu-mate-artwork \ + ubuntu-mate-default-settings \ + ubuntu-mate-desktop \ + ubuntu-mate-icon-themes && \ echo "**** cleanup ****" && \ apt-get autoclean && \ rm -rf \ diff --git a/Jenkinsfile b/Jenkinsfile index f67e904c..794a68d2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}':mate-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 mate-focal build use live docker endpoints stage("Set ENV live build"){ when { - branch "master" + branch "mate-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 "mate-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 "mate-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=mate-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 mate-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 "mate-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 "mate-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 mate-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 "mate-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 "mate-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}:mate-focal + docker push ${PUSHIMAGE}:mate-focal docker push ${PUSHIMAGE}:${META_TAG} done for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:${META_TAG} \ - ${DELETEIMAGE}:latest || : + ${DELETEIMAGE}:mate-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-mate-focal + docker tag ${MANIFESTIMAGE}:arm32v7-${META_TAG} ${MANIFESTIMAGE}:arm32v7-mate-focal + docker tag ${MANIFESTIMAGE}:arm64v8-${META_TAG} ${MANIFESTIMAGE}:arm64v8-mate-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-mate-focal + docker push ${MANIFESTIMAGE}:arm32v7-mate-focal + docker push ${MANIFESTIMAGE}:arm64v8-mate-focal + docker manifest push --purge ${MANIFESTIMAGE}:mate-focal || : + docker manifest create ${MANIFESTIMAGE}:mate-focal ${MANIFESTIMAGE}:amd64-mate-focal ${MANIFESTIMAGE}:arm32v7-mate-focal ${MANIFESTIMAGE}:arm64v8-mate-focal + docker manifest annotate ${MANIFESTIMAGE}:mate-focal ${MANIFESTIMAGE}:arm32v7-mate-focal --os linux --arch arm + docker manifest annotate ${MANIFESTIMAGE}:mate-focal ${MANIFESTIMAGE}:arm64v8-mate-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}:mate-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}:mate-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-mate-focal + docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-mate-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}:mate-focal docker push ${LEGACYIMAGE}:${META_TAG} - docker push ${LEGACYIMAGE}:arm32v7-latest - docker push ${LEGACYIMAGE}:arm64v8-latest + docker push ${LEGACYIMAGE}:arm32v7-mate-focal + docker push ${LEGACYIMAGE}:arm64v8-mate-focal done ''' sh '''#! /bin/bash for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do docker rmi \ ${DELETEIMAGE}:amd64-${META_TAG} \ - ${DELETEIMAGE}:amd64-latest \ + ${DELETEIMAGE}:amd64-mate-focal \ ${DELETEIMAGE}:arm32v7-${META_TAG} \ - ${DELETEIMAGE}:arm32v7-latest \ + ${DELETEIMAGE}:arm32v7-mate-focal \ ${DELETEIMAGE}:arm64v8-${META_TAG} \ - ${DELETEIMAGE}:arm64v8-latest || : + ${DELETEIMAGE}:arm64v8-mate-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 "mate-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 mate-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": "mate-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''' } diff --git a/README.md b/README.md index 0fbfafb8..a9de5670 100644 --- a/README.md +++ b/README.md @@ -63,8 +63,6 @@ This image provides various versions that are available via tags. `latest` tag u | :----: | --- | | latest | XFCE Focal | | xfce-bionic | XFCE Bionic | -| gnome-focal | GNOME Focal | -| gnome-bionic | GNOME Bionic | | kde-focal | KDE Focal | | kde-bionic | KDE Bionic | | lxde-focal | LXDE Focal | diff --git a/jenkins-vars.yml b/jenkins-vars.yml index d0684263..d7c95889 100644 --- 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: mate-focal +ls_branch: mate-focal repo_vars: - BUILD_VERSION_ARG = 'OS_VERSION' - LS_USER = 'linuxserver' diff --git a/readme-vars.yml b/readme-vars.yml index 54080bc5..126f1f97 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -19,8 +19,6 @@ development_versions: true development_versions_items: - { tag: "latest", desc: "XFCE Focal" } - { tag: "xfce-bionic", desc: "XFCE Bionic" } - - { tag: "gnome-focal", desc: "GNOME Focal" } - - { tag: "gnome-bionic", desc: "GNOME Bionic" } - { tag: "kde-focal", desc: "KDE Focal" } - { tag: "kde-bionic", desc: "KDE Bionic" } - { tag: "lxde-focal", desc: "LXDE Focal" } diff --git a/root/defaults/startwm.sh b/root/defaults/startwm.sh index e4dc5aac..1c91b97c 100755 --- 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/mate-session > /dev/null 2>&1