adding arch-openbox branch

13e0bda5 · thelamer · 85f935cd · 13e0bda5 · 13e0bda5 · 13e0bda5
Commit 13e0bda5 authored 3 years ago by thelamer
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,7 +24,7 @@
 ## Readme

 If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
-Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-webtop/edit/alpine-openbox/readme-vars.yml).
+Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-webtop/edit/arch-openbox/readme-vars.yml).

 These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
 Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-webtop)
@@ -115,7 +115,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

 ## Update the changelog

-If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-webtop/tree/alpine-openbox/root), add an entry to the changelog
+If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-webtop/tree/arch-openbox/root), add an entry to the changelog

 ```yml
 changelogs:

--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -21,7 +21,7 @@

 ------------------------------

- - [ ] I have read the [contributing](https://github.com/linuxserver/docker-webtop/blob/alpine-openbox/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
+ - [ ] I have read the [contributing](https://github.com/linuxserver/docker-webtop/blob/arch-openbox/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

 ------------------------------


--- a/.github/workflows/external_trigger.yml
+++ b/.github/workflows/external_trigger.yml
@@ -4,90 +4,13 @@ on:
  workflow_dispatch:

 jobs:
-  external-trigger-alpine-openbox:
+  external-trigger-arch-openbox:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3

      - name: External Trigger
-        if: github.ref == 'refs/heads/alpine-openbox'
+        if: github.ref == 'refs/heads/arch-openbox'
        run: |
-          if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_WEBTOP_ALPINE_OPENBOX }}" ]; then
-            echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_WEBTOP_ALPINE_OPENBOX is set; skipping trigger. ****"
-            exit 0
-          fi
-          echo "**** External trigger running off of alpine-openbox branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBTOP_ALPINE_OPENBOX\". ****"
-          echo "**** Retrieving external version ****"
-          EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.14/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
-            && awk '/^P:'"openbox"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
-          if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
-            echo "**** Can't retrieve external version, exiting ****"
-            FAILURE_REASON="Can't retrieve external version for webtop branch alpine-openbox"
-            GHA_TRIGGER_URL="https://github.com/linuxserver/docker-webtop/actions/runs/${{ github.run_id }}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
-              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            exit 1
-          fi
-          EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
-          echo "**** External version: ${EXT_RELEASE} ****"
-          echo "**** Retrieving last pushed version ****"
-          image="linuxserver/webtop"
-          tag="alpine-openbox"
-          token=$(curl -sX GET \
-            "https://ghcr.io/token?scope=repository%3Alinuxserver%2Fwebtop%3Apull" \
-            | jq -r '.token')
-            multidigest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${tag}" \
-              | jq -r 'first(.manifests[].digest)')
-            digest=$(curl -s \
-              --header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
-              --header "Authorization: Bearer ${token}" \
-              "https://ghcr.io/v2/${image}/manifests/${multidigest}" \
-              | jq -r '.config.digest')
-          image_info=$(curl -sL \
-            --header "Authorization: Bearer ${token}" \
-            "https://ghcr.io/v2/${image}/blobs/${digest}" \
-            | jq -r '.container_config')
-          IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
-          IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
-          if [ -z "${IMAGE_VERSION}" ]; then
-            echo "**** Can't retrieve last pushed version, exiting ****"
-            FAILURE_REASON="Can't retrieve last pushed version for webtop tag alpine-openbox"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
-              "description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-            exit 1
-          fi
-          echo "**** Last pushed version: ${IMAGE_VERSION} ****"
-          if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
-            echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
-            exit 0
-          elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/alpine-openbox/lastBuild/api/json | jq -r '.building') == "true" ]; then
-            echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
-            exit 0
-          else
-            echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
-            response=$(curl -iX POST \
-              https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/alpine-openbox/buildWithParameters?PACKAGE_CHECK=false \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
-            echo "**** Jenkins job queue url: ${response%$'\r'} ****"
-            echo "**** Sleeping 10 seconds until job starts ****"
-            sleep 10
-            buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
-            buildurl="${buildurl%$'\r'}"
-            echo "**** Jenkins job build url: ${buildurl} ****"
-            echo "**** Attempting to change the Jenkins job description ****"
-            curl -iX POST \
-              "${buildurl}submitDescription" \
-              --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
-              --data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
-              --data-urlencode "Submit=Submit"
-            echo "**** Notifying Discord ****"
-            TRIGGER_REASON="A version change was detected for webtop tag alpine-openbox. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
-            curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
-              "description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
-              "username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
-          fi
+          echo "**** No external release, exiting ****"
+          exit 0
--- a/.github/workflows/greetings.yml
+++ b/.github/workflows/greetings.yml
@@ -8,6 +8,6 @@ jobs:
    steps:
    - uses: actions/first-interaction@v1
      with:
-        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-webtop/blob/alpine-openbox/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-webtop/blob/alpine-openbox/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
-        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-webtop/blob/alpine-openbox/.github/PULL_REQUEST_TEMPLATE.md)!'
+        issue-message: 'Thanks for opening your first issue here! Be sure to follow the [bug](https://github.com/linuxserver/docker-webtop/blob/arch-openbox/.github/ISSUE_TEMPLATE/issue.bug.md) or [feature](https://github.com/linuxserver/docker-webtop/blob/arch-openbox/.github/ISSUE_TEMPLATE/issue.feature.md) issue templates!'
+        pr-message: 'Thanks for opening this pull request! Be sure to follow the [pull request template](https://github.com/linuxserver/docker-webtop/blob/arch-openbox/.github/PULL_REQUEST_TEMPLATE.md)!'
        repo-token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/package_trigger.yml
+++ b/.github/workflows/package_trigger.yml
@@ -4,25 +4,25 @@ on:
  workflow_dispatch:

 jobs:
-  package-trigger-alpine-openbox:
+  package-trigger-arch-openbox:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v2.3.3

      - name: Package Trigger
-        if: github.ref == 'refs/heads/alpine-openbox'
+        if: github.ref == 'refs/heads/arch-openbox'
        run: |
-          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_WEBTOP_ALPINE_OPENBOX }}" ]; then
-            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_WEBTOP_ALPINE_OPENBOX is set; skipping trigger. ****"
+          if [ -n "${{ secrets.PAUSE_PACKAGE_TRIGGER_WEBTOP_ARCH_OPENBOX }}" ]; then
+            echo "**** Github secret PAUSE_PACKAGE_TRIGGER_WEBTOP_ARCH_OPENBOX is set; skipping trigger. ****"
            exit 0
          fi
-          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/alpine-openbox/lastBuild/api/json | jq -r '.building') == "true" ]; then
+          if [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/arch-openbox/lastBuild/api/json | jq -r '.building') == "true" ]; then
            echo "**** There already seems to be an active build on Jenkins; skipping package trigger ****"
            exit 0
          fi
-          echo "**** Package trigger running off of alpine-openbox branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_WEBTOP_ALPINE_OPENBOX\". ****"
+          echo "**** Package trigger running off of arch-openbox branch. To disable, set a Github secret named \"PAUSE_PACKAGE_TRIGGER_WEBTOP_ARCH_OPENBOX\". ****"
          response=$(curl -iX POST \
-            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/alpine-openbox/buildWithParameters?PACKAGE_CHECK=true \
+            https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/arch-openbox/buildWithParameters?PACKAGE_CHECK=true \
            --user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
          echo "**** Jenkins job queue url: ${response%$'\r'} ****"
          echo "**** Sleeping 10 seconds until job starts ****"

--- a/Dockerfile
+++ b/Dockerfile
-FROM lsiobase/rdesktop-web:alpine
+FROM lsiobase/rdesktop-web:arch

 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG OPENBOX_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"


 RUN \
  echo "**** install packages ****" && \
-  apk add --no-cache \
-    firefox-esr \
-    leafpad && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  pacman -Sy --noconfirm --needed \
+    firefox \
+    leafpad \
    obconf-qt && \
-  echo "**** openbox tweaks ****" && \
-  ln -s /usr/bin/obconf-qt /usr/bin/obconf && \
  echo "**** cleanup ****" && \
  rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/cache/pacman/pkg/* \
+    /var/lib/pacman/sync/*

 # add local files
 COPY /root /

--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
-FROM lsiobase/rdesktop-web:arm64v8-alpine
+FROM lsiobase/rdesktop-web:arm64v8-arch

 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG OPENBOX_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"


 RUN \
  echo "**** install packages ****" && \
-  apk add --no-cache \
-    firefox-esr \
-    leafpad && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  pacman -Sy --noconfirm --needed \
+    firefox \
+    leafpad \
    obconf-qt && \
-  echo "**** openbox tweaks ****" && \
-  ln -s /usr/bin/obconf-qt /usr/bin/obconf && \
  echo "**** cleanup ****" && \
  rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/cache/pacman/pkg/* \
+    /var/lib/pacman/sync/*

 # add local files
 COPY /root /

--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
-FROM lsiobase/rdesktop-web:arm32v7-alpine
+FROM lsiobase/rdesktop-web:arm32v7-arch

 # set version label
 ARG BUILD_DATE
 ARG VERSION
-ARG OPENBOX_VERSION
 LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
 LABEL maintainer="thelamer"


 RUN \
  echo "**** install packages ****" && \
-  apk add --no-cache \
-    firefox-esr \
-    leafpad && \
-  apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+  pacman -Sy --noconfirm --needed \
+    firefox \
+    leafpad \
    obconf-qt && \
-  echo "**** openbox tweaks ****" && \
-  ln -s /usr/bin/obconf-qt /usr/bin/obconf && \
  echo "**** cleanup ****" && \
  rm -rf \
-    /tmp/*
+    /tmp/* \
+    /var/cache/pacman/pkg/* \
+    /var/lib/pacman/sync/*

 # add local files
 COPY /root /

--- a/Jenkinsfile
+++ b/Jenkinsfile
--- a/README.md
+++ b/README.md
 <!-- DO NOT EDIT THIS FILE MANUALLY  -->
-<!-- Please read the https://github.com/linuxserver/docker-webtop/blob/alpine-openbox/.github/CONTRIBUTING.md -->
+<!-- Please read the https://github.com/linuxserver/docker-webtop/blob/arch-openbox/.github/CONTRIBUTING.md -->

 [![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)

@@ -35,7 +35,7 @@ Find us at:
 [![GitLab Container Registry](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab)](https://gitlab.com/linuxserver.io/docker-webtop/container_registry)
 [![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/webtop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/webtop)
 [![Docker Stars](https://img.shields.io/docker/stars/linuxserver/webtop.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/webtop)
-[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-webtop%2Fjob%2Falpine-openbox%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/alpine-openbox/)
+[![Jenkins Build](https://img.shields.io/jenkins/build?labelColor=555555&logoColor=ffffff&style=for-the-badge&jobUrl=https%3A%2F%2Fci.linuxserver.io%2Fjob%2FDocker-Pipeline-Builders%2Fjob%2Fdocker-webtop%2Fjob%2Farch-openbox%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/arch-openbox/)
 [![LSIO CI](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=CI&query=CI&url=https%3A%2F%2Fci-tests.linuxserver.io%2Flinuxserver%2Fwebtop%2Flatest%2Fci-status.yml)](https://ci-tests.linuxserver.io/linuxserver/webtop/latest/index.html)

 [Webtop](https://github.com/linuxserver/docker-webtop) - Alpine and Ubuntu based containers containing full desktop environments in officially supported flavors accessible via any modern web browser.

--- a/jenkins-vars.yml
+++ b/jenkins-vars.yml
@@ -2,10 +2,10 @@

 # jenkins variables
 project_name: docker-webtop
-external_type: alpine_repo
+external_type: os
 release_type: prerelease
-release_tag: alpine-openbox
-ls_branch: alpine-openbox
+release_tag: arch-openbox
+ls_branch: arch-openbox
 repo_vars:
  - BUILD_VERSION_ARG = 'OPENBOX_VERSION'
  - LS_USER = 'linuxserver'
@@ -14,10 +14,7 @@ repo_vars:
  - DOCKERHUB_IMAGE = 'linuxserver/webtop'
  - DEV_DOCKERHUB_IMAGE = 'lsiodev/webtop'
  - PR_DOCKERHUB_IMAGE = 'lspipepr/webtop'
-  - DIST_IMAGE = 'alpine'
-  - DIST_TAG = '3.14'
-  - DIST_REPO = 'http://dl-cdn.alpinelinux.org/alpine/v3.14/community/'
-  - DIST_REPO_PACKAGES = 'openbox'
+  - DIST_IMAGE = 'arch'
  - MULTIARCH = 'true'
  - CI = 'true'
  - CI_WEB = 'true'

--- a/root/defaults/startwm.sh
+++ b/root/defaults/startwm.sh
 #!/bin/bash
-/usr/bin/pulseaudio --start
+PULSE_SCRIPT=/etc/xrdp/pulse/default.pa /startpulse.sh &
 /usr/bin/openbox-session > /dev/null 2>&1