Skip to content

Commit 978b98f

Browse files
committed
adding initial XFCE alpine
1 parent 0e50ed9 commit 978b98f

21 files changed

+2538
-1
lines changed

.github/CONTRIBUTING.md

+123
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,123 @@
1+
# Contributing to webtop
2+
3+
## Gotchas
4+
5+
* While contributing make sure to make all your changes before creating a Pull Request, as our pipeline builds each commit after the PR is open.
6+
* Read, and fill the Pull Request template
7+
* If this is a fix for a typo in code or documentation in the README please file an issue
8+
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
9+
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
10+
11+
## Common files
12+
13+
| File | Use case |
14+
| :----: | --- |
15+
| `Dockerfile` | Dockerfile used to build amd64 images |
16+
| `Dockerfile.aarch64` | Dockerfile used to build 64bit ARM architectures |
17+
| `Dockerfile.armhf` | Dockerfile used to build 32bit ARM architectures |
18+
| `Jenkinsfile` | This file is a product of our builder and should not be edited directly. This is used to build the image |
19+
| `jenkins-vars.yml` | This file is used to generate the `Jenkinsfile` mentioned above, it only affects the build-process |
20+
| `package_versions.txt` | This file is generated as a part of the build-process and should not be edited directly. It lists all the installed packages and their versions |
21+
| `README.md` | This file is a product of our builder and should not be edited directly. This displays the readme for the repository and image registries |
22+
| `readme-vars.yml` | This file is used to generate the `README.md` |
23+
24+
## Readme
25+
26+
If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
27+
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-webtop/edit/master/readme-vars.yml).
28+
29+
These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
30+
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-webtop)
31+
32+
### Fixing typos or clarify the text in the readme
33+
34+
There are variables for multiple parts of the readme, the most common ones are:
35+
36+
| Variable | Description |
37+
| :----: | --- |
38+
| `project_blurb` | This is the short excerpt shown above the project logo. |
39+
| `app_setup_block` | This is the text that shows up under "Application Setup" if enabled |
40+
41+
### Parameters
42+
43+
The compose and run examples are also generated from these variables.
44+
45+
We have a [reference file](https://github.com/linuxserver/docker-jenkins-builder/blob/master/vars/_container-vars-blank) in our Jenkins Builder.
46+
47+
These are prefixed with `param_` for required parameters, or `opt_param` for optional parameters, except for `cap_add`.
48+
Remember to enable param, if currently disabled. This differs between parameters, and can be seen in the reference file.
49+
50+
Devices, environment variables, ports and volumes expects its variables in a certain way.
51+
52+
### Devices
53+
54+
```yml
55+
param_devices:
56+
- { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
57+
opt_param_devices:
58+
- { device_path: "/dev/dri", device_host_path: "/dev/dri", desc: "For hardware transcoding" }
59+
```
60+
61+
### Environment variables
62+
63+
```yml
64+
param_env_vars:
65+
- { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
66+
opt_param_env_vars:
67+
- { env_var: "VERSION", env_value: "latest", desc: "Supported values are LATEST, PLEXPASS or a specific version number." }
68+
```
69+
70+
### Ports
71+
72+
```yml
73+
param_ports:
74+
- { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
75+
opt_param_ports:
76+
- { external_port: "80", internal_port: "80", port_desc: "Application WebUI" }
77+
```
78+
79+
### Volumes
80+
81+
```yml
82+
param_volumes:
83+
- { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
84+
opt_param_volumes:
85+
- { vol_path: "/config", vol_host_path: "</path/to/appdata/config>", desc: "Configuration files." }
86+
```
87+
88+
### Testing template changes
89+
90+
After you make any changes to the templates, you can use our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) to have the files updated from the modified templates. Please use the command found under `Running Locally` [on this page](https://github.com/linuxserver/docker-jenkins-builder/blob/master/README.md) to generate them prior to submitting a PR.
91+
92+
## Dockerfiles
93+
94+
We use multiple Dockerfiles in our repos, this is because sometimes some CPU architectures needs different packages to work.
95+
If you are proposing additional packages to be added, ensure that you added the packages to all the Dockerfiles in alphabetical order.
96+
97+
### Testing your changes
98+
99+
```bash
100+
git clone https://github.com/linuxserver/docker-webtop.git
101+
cd docker-webtop
102+
docker build \
103+
--no-cache \
104+
--pull \
105+
-t linuxserver/webtop:latest .
106+
```
107+
108+
The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
109+
110+
```bash
111+
docker run --rm --privileged multiarch/qemu-user-static:register --reset
112+
```
113+
114+
Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.
115+
116+
## Update the changelog
117+
118+
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-webtop/tree/master/root), add an entry to the changelog
119+
120+
```yml
121+
changelogs:
122+
- { date: "DD.MM.YY:", desc: "Added some love to templates" }
123+
```

.github/FUNDING.yml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
github: linuxserver
2+
open_collective: linuxserver

.github/ISSUE_TEMPLATE/config.yml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Discord chat support
4+
url: https://discord.gg/YWrKVTn
5+
about: Realtime support / chat with the community and the team.
6+
7+
- name: Discourse discussion forum
8+
url: https://discourse.linuxserver.io
9+
about: Post on our community forum.
10+
11+
- name: Documentation
12+
url: https://docs.linuxserver.io/images/docker-webtop
13+
about: Documentation - information about all of our containers.

.github/ISSUE_TEMPLATE/issue.bug.md

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
[linuxserverurl]: https://linuxserver.io
7+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
8+
9+
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
10+
11+
<!--- Provide a general summary of the bug in the Title above -->
12+
13+
------------------------------
14+
15+
## Expected Behavior
16+
<!--- Tell us what should happen -->
17+
18+
## Current Behavior
19+
<!--- Tell us what happens instead of the expected behavior -->
20+
21+
## Steps to Reproduce
22+
<!--- Provide a link to a live example, or an unambiguous set of steps to -->
23+
<!--- reproduce this bug. Include code to reproduce, if relevant -->
24+
1.
25+
2.
26+
3.
27+
4.
28+
29+
## Environment
30+
**OS:**
31+
**CPU architecture:** x86_64/arm32/arm64
32+
**How docker service was installed:**
33+
<!--- ie. from the official docker repo, from the distro repo, nas OS provided, etc. -->
34+
<!--- Providing context helps us come up with a solution that is most useful in the real world -->
35+
36+
## Command used to create docker container (run/create/compose/screenshot)
37+
<!--- Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container -->
38+
39+
## Docker logs
40+
<!--- Provide a full docker log, output of "docker logs webtop" -->
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
[linuxserverurl]: https://linuxserver.io
7+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
8+
9+
<!--- If you are new to Docker or this application our issue tracker is **ONLY** used for reporting bugs or requesting features. Please use [our discord server](https://discord.gg/YWrKVTn) for general support. --->
10+
11+
<!--- If this acts as a feature request please ask yourself if this modification is something the whole userbase will benefit from --->
12+
<!--- If this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
13+
14+
<!--- Provide a general summary of the request in the Title above -->
15+
16+
------------------------------
17+
18+
## Desired Behavior
19+
<!--- Tell us what should happen -->
20+
21+
## Current Behavior
22+
<!--- Tell us what happens instead of the expected behavior -->
23+
24+
## Alternatives Considered
25+
<!--- Tell us what other options you have tried or considered -->

.github/PULL_REQUEST_TEMPLATE.md

+43
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
[linuxserverurl]: https://linuxserver.io
4+
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)][linuxserverurl]
5+
6+
7+
<!--- Before submitting a pull request please check the following -->
8+
9+
<!--- If this is a fix for a typo in code or documentation in the README please file an issue and let us sort it out we do not need a PR -->
10+
<!--- Ask yourself if this modification is something the whole userbase will benefit from, if this is a specific change for corner case functionality or plugins please look at making a Docker Mod or local script https://blog.linuxserver.io/2019/09/14/customizing-our-containers/ -->
11+
<!--- That if the PR is addressing an existing issue include, closes #<issue number> , in the body of the PR commit message -->
12+
<!--- You have included links to any files / patches etc your PR may be using in the body of the PR commit message -->
13+
<!--- We maintain a changelog of major revisions to the container at the end of readme-vars.yml in the root of this repository, please add your changes there if appropriate -->
14+
15+
16+
<!--- Coding guidelines: -->
17+
<!--- 1. Installed packages in the Dockerfiles should be in alphabetical order -->
18+
<!--- 2. Changes to Dockerfile should be replicated in Dockerfile.armhf and Dockerfile.aarch64 if applicable -->
19+
<!--- 3. Indentation style (tabs vs 4 spaces vs 1 space) should match the rest of the document -->
20+
<!--- 4. Readme is auto generated from readme-vars.yml, make your changes there -->
21+
22+
------------------------------
23+
24+
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-webtop/blob/master/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
25+
26+
------------------------------
27+
28+
<!--- We welcome all PR’s though this doesn’t guarantee it will be accepted. -->
29+
30+
## Description:
31+
<!--- Describe your changes in detail -->
32+
33+
## Benefits of this PR and context:
34+
<!--- Please explain why we should accept this PR. If this fixes an outstanding bug, please reference the issue # -->
35+
36+
## How Has This Been Tested?
37+
<!--- Please describe in detail how you tested your changes. -->
38+
<!--- Include details of your testing environment, and the tests you ran to -->
39+
<!--- see how your change affects other areas of the code, etc. -->
40+
41+
42+
## Source / References:
43+
<!--- Please include any forum posts/github links relevant to the PR -->
+93
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
name: External Trigger Main
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
external-trigger-master:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/[email protected]
11+
12+
- name: External Trigger
13+
if: github.ref == 'refs/heads/master'
14+
run: |
15+
if [ -n "${{ secrets.PAUSE_EXTERNAL_TRIGGER_WEBTOP_MASTER }}" ]; then
16+
echo "**** Github secret PAUSE_EXTERNAL_TRIGGER_WEBTOP_MASTER is set; skipping trigger. ****"
17+
exit 0
18+
fi
19+
echo "**** External trigger running off of master branch. To disable this trigger, set a Github secret named \"PAUSE_EXTERNAL_TRIGGER_WEBTOP_MASTER\". ****"
20+
echo "**** Retrieving external version ****"
21+
EXT_RELEASE=$(curl -sL "http://dl-cdn.alpinelinux.org/alpine/v3.13/community/x86_64/APKINDEX.tar.gz" | tar -xz -C /tmp \
22+
&& awk '/^P:'"xfce4"'$/,/V:/' /tmp/APKINDEX | sed -n 2p | sed 's/^V://')
23+
if [ -z "${EXT_RELEASE}" ] || [ "${EXT_RELEASE}" == "null" ]; then
24+
echo "**** Can't retrieve external version, exiting ****"
25+
FAILURE_REASON="Can't retrieve external version for webtop branch master"
26+
GHA_TRIGGER_URL="https://github.com/linuxserver/docker-webtop/actions/runs/${{ github.run_id }}"
27+
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
28+
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n**Trigger URL:** '"${GHA_TRIGGER_URL}"' \n"}],
29+
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
30+
exit 1
31+
fi
32+
EXT_RELEASE=$(echo ${EXT_RELEASE} | sed 's/[~,%@+;:/]//g')
33+
echo "**** External version: ${EXT_RELEASE} ****"
34+
echo "**** Retrieving last pushed version ****"
35+
image="linuxserver/webtop"
36+
tag="latest"
37+
token=$(curl -sX GET \
38+
"https://ghcr.io/token?scope=repository%3Alinuxserver%2Fwebtop%3Apull" \
39+
| jq -r '.token')
40+
multidigest=$(curl -s \
41+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
42+
--header "Authorization: Bearer ${token}" \
43+
"https://ghcr.io/v2/${image}/manifests/${tag}" \
44+
| jq -r 'first(.manifests[].digest)')
45+
digest=$(curl -s \
46+
--header "Accept: application/vnd.docker.distribution.manifest.v2+json" \
47+
--header "Authorization: Bearer ${token}" \
48+
"https://ghcr.io/v2/${image}/manifests/${multidigest}" \
49+
| jq -r '.config.digest')
50+
image_info=$(curl -sL \
51+
--header "Authorization: Bearer ${token}" \
52+
"https://ghcr.io/v2/${image}/blobs/${digest}" \
53+
| jq -r '.container_config')
54+
IMAGE_RELEASE=$(echo ${image_info} | jq -r '.Labels.build_version' | awk '{print $3}')
55+
IMAGE_VERSION=$(echo ${IMAGE_RELEASE} | awk -F'-ls' '{print $1}')
56+
if [ -z "${IMAGE_VERSION}" ]; then
57+
echo "**** Can't retrieve last pushed version, exiting ****"
58+
FAILURE_REASON="Can't retrieve last pushed version for webtop tag latest"
59+
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 16711680,
60+
"description": "**Trigger Failed** \n**Reason:** '"${FAILURE_REASON}"' \n"}],
61+
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
62+
exit 1
63+
fi
64+
echo "**** Last pushed version: ${IMAGE_VERSION} ****"
65+
if [ "${EXT_RELEASE}" == "${IMAGE_VERSION}" ]; then
66+
echo "**** Version ${EXT_RELEASE} already pushed, exiting ****"
67+
exit 0
68+
elif [ $(curl -s https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/master/lastBuild/api/json | jq -r '.building') == "true" ]; then
69+
echo "**** New version ${EXT_RELEASE} found; but there already seems to be an active build on Jenkins; exiting ****"
70+
exit 0
71+
else
72+
echo "**** New version ${EXT_RELEASE} found; old version was ${IMAGE_VERSION}. Triggering new build ****"
73+
response=$(curl -iX POST \
74+
https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-webtop/job/master/buildWithParameters?PACKAGE_CHECK=false \
75+
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} | grep -i location | sed "s|^[L|l]ocation: \(.*\)|\1|")
76+
echo "**** Jenkins job queue url: ${response%$'\r'} ****"
77+
echo "**** Sleeping 10 seconds until job starts ****"
78+
sleep 10
79+
buildurl=$(curl -s "${response%$'\r'}api/json" | jq -r '.executable.url')
80+
buildurl="${buildurl%$'\r'}"
81+
echo "**** Jenkins job build url: ${buildurl} ****"
82+
echo "**** Attempting to change the Jenkins job description ****"
83+
curl -iX POST \
84+
"${buildurl}submitDescription" \
85+
--user ${{ secrets.JENKINS_USER }}:${{ secrets.JENKINS_TOKEN }} \
86+
--data-urlencode "description=GHA external trigger https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
87+
--data-urlencode "Submit=Submit"
88+
echo "**** Notifying Discord ****"
89+
TRIGGER_REASON="A version change was detected for webtop tag latest. Old version:${IMAGE_VERSION} New version:${EXT_RELEASE}"
90+
curl -X POST -H "Content-Type: application/json" --data '{"avatar_url": "https://cdn.discordapp.com/avatars/354986384542662657/df91181b3f1cf0ef1592fbe18e0962d7.png","embeds": [{"color": 9802903,
91+
"description": "**Build Triggered** \n**Reason:** '"${TRIGGER_REASON}"' \n**Build URL:** '"${buildurl}display/redirect"' \n"}],
92+
"username": "Github Actions"}' ${{ secrets.DISCORD_WEBHOOK }}
93+
fi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
name: External Trigger Scheduler
2+
3+
on:
4+
schedule:
5+
- cron: '15 * * * *'
6+
workflow_dispatch:
7+
8+
jobs:
9+
external-trigger-scheduler:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/[email protected]
13+
with:
14+
fetch-depth: '0'
15+
16+
- name: External Trigger Scheduler
17+
run: |
18+
echo "**** Branches found: ****"
19+
git for-each-ref --format='%(refname:short)' refs/remotes
20+
echo "**** Pulling the yq docker image ****"
21+
docker pull ghcr.io/linuxserver/yq
22+
for br in $(git for-each-ref --format='%(refname:short)' refs/remotes)
23+
do
24+
br=$(echo "$br" | sed 's|origin/||g')
25+
echo "**** Evaluating branch ${br} ****"
26+
ls_branch=$(curl -sX GET https://raw.githubusercontent.com/linuxserver/docker-webtop/${br}/jenkins-vars.yml \
27+
| docker run --rm -i --entrypoint yq ghcr.io/linuxserver/yq -r .ls_branch)
28+
if [ "$br" == "$ls_branch" ]; then
29+
echo "**** Branch ${br} appears to be live; checking workflow. ****"
30+
if curl -sfX GET https://raw.githubusercontent.com/linuxserver/docker-webtop/${br}/.github/workflows/external_trigger.yml > /dev/null 2>&1; then
31+
echo "**** Workflow exists. Triggering external trigger workflow for branch ${br} ****."
32+
curl -iX POST \
33+
-H "Authorization: token ${{ secrets.CR_PAT }}" \
34+
-H "Accept: application/vnd.github.v3+json" \
35+
-d "{\"ref\":\"refs/heads/${br}\"}" \
36+
https://api.github.com/repos/linuxserver/docker-webtop/actions/workflows/external_trigger.yml/dispatches
37+
else
38+
echo "**** Workflow doesn't exist; skipping trigger. ****"
39+
fi
40+
else
41+
echo "**** ${br} appears to be a dev branch; skipping trigger. ****"
42+
fi
43+
done

0 commit comments

Comments
 (0)