Skip to content

Commit fbc3297

Browse files
thelamerthelamer
authored
Merge pull request #31 from linuxserver/raspbian
add support for 64bit raspbian, fix typo in init
2 parents 5f02d66 + 4cfaea2 commit fbc3297

File tree

4 files changed

+43
-56
lines changed

4 files changed

+43
-56
lines changed

‎Jenkinsfile‎

Lines changed: 17 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ pipeline {
128128
steps {
129129
script{
130130
env.IMAGE = env.DOCKERHUB_IMAGE
131-
env.QUAYIMAGE = 'quay.io/linuxserver.io/' + env.CONTAINER_NAME
132131
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/' + env.CONTAINER_NAME
133132
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/' + env.CONTAINER_NAME
134133
if (env.MULTIARCH == 'true') {
@@ -149,7 +148,6 @@ pipeline {
149148
steps {
150149
script{
151150
env.IMAGE = env.DEV_DOCKERHUB_IMAGE
152-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lsiodev-' + env.CONTAINER_NAME
153151
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
154152
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lsiodev-' + env.CONTAINER_NAME
155153
if (env.MULTIARCH == 'true') {
@@ -170,7 +168,6 @@ pipeline {
170168
steps {
171169
script{
172170
env.IMAGE = env.PR_DOCKERHUB_IMAGE
173-
env.QUAYIMAGE = 'quay.io/linuxserver.io/lspipepr-' + env.CONTAINER_NAME
174171
env.GITHUBIMAGE = 'docker.pkg.github.com/' + env.LS_USER + '/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
175172
env.GITLABIMAGE = 'registry.gitlab.com/linuxserver.io/' + env.LS_REPO + '/lspipepr-' + env.CONTAINER_NAME
176173
if (env.MULTIARCH == 'true') {
@@ -535,22 +532,15 @@ pipeline {
535532
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
536533
usernameVariable: 'DOCKERUSER',
537534
passwordVariable: 'DOCKERPASS'
538-
],
539-
[
540-
$class: 'UsernamePasswordMultiBinding',
541-
credentialsId: 'Quay.io-Robot',
542-
usernameVariable: 'QUAYUSER',
543-
passwordVariable: 'QUAYPASS'
544535
]
545536
]) {
546537
retry(5) {
547538
sh '''#! /bin/bash
548539
set -e
549-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
550540
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
551541
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
552542
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
553-
for PUSHIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
543+
for PUSHIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
554544
docker tag ${IMAGE}:${META_TAG} ${PUSHIMAGE}:${META_TAG}
555545
docker tag ${PUSHIMAGE}:${META_TAG} ${PUSHIMAGE}:latest
556546
docker push ${PUSHIMAGE}:latest
@@ -559,7 +549,7 @@ pipeline {
559549
'''
560550
}
561551
sh '''#! /bin/bash
562-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
552+
for DELETEIMAGE in "${GITHUBIMAGE}" "{GITLABIMAGE}" "${IMAGE}"; do
563553
docker rmi \
564554
${DELETEIMAGE}:${META_TAG} \
565555
${DELETEIMAGE}:latest || :
@@ -581,18 +571,11 @@ pipeline {
581571
credentialsId: '3f9ba4d5-100d-45b0-a3c4-633fd6061207',
582572
usernameVariable: 'DOCKERUSER',
583573
passwordVariable: 'DOCKERPASS'
584-
],
585-
[
586-
$class: 'UsernamePasswordMultiBinding',
587-
credentialsId: 'Quay.io-Robot',
588-
usernameVariable: 'QUAYUSER',
589-
passwordVariable: 'QUAYPASS'
590574
]
591575
]) {
592576
retry(5) {
593577
sh '''#! /bin/bash
594578
set -e
595-
echo $QUAYPASS | docker login quay.io -u $QUAYUSER --password-stdin
596579
echo $DOCKERPASS | docker login -u $DOCKERUSER --password-stdin
597580
echo $GITHUB_TOKEN | docker login docker.pkg.github.com -u LinuxServer-CI --password-stdin
598581
echo $GITLAB_TOKEN | docker login registry.gitlab.com -u LinuxServer.io --password-stdin
@@ -626,26 +609,24 @@ pipeline {
626609
docker manifest push --purge ${MANIFESTIMAGE}:latest
627610
docker manifest push --purge ${MANIFESTIMAGE}:${META_TAG}
628611
done
629-
for LEGACYIMAGE in "${GITHUBIMAGE}" "${QUAYIMAGE}"; do
630-
docker tag ${IMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:amd64-${META_TAG}
631-
docker tag ${IMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-${META_TAG}
632-
docker tag ${IMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-${META_TAG}
633-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:latest
634-
docker tag ${LEGACYIMAGE}:amd64-${META_TAG} ${LEGACYIMAGE}:${META_TAG}
635-
docker tag ${LEGACYIMAGE}:arm32v7-${META_TAG} ${LEGACYIMAGE}:arm32v7-latest
636-
docker tag ${LEGACYIMAGE}:arm64v8-${META_TAG} ${LEGACYIMAGE}:arm64v8-latest
637-
docker push ${LEGACYIMAGE}:amd64-${META_TAG}
638-
docker push ${LEGACYIMAGE}:arm32v7-${META_TAG}
639-
docker push ${LEGACYIMAGE}:arm64v8-${META_TAG}
640-
docker push ${LEGACYIMAGE}:latest
641-
docker push ${LEGACYIMAGE}:${META_TAG}
642-
docker push ${LEGACYIMAGE}:arm32v7-latest
643-
docker push ${LEGACYIMAGE}:arm64v8-latest
644-
done
612+
docker tag ${IMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:amd64-${META_TAG}
613+
docker tag ${IMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-${META_TAG}
614+
docker tag ${IMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-${META_TAG}
615+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:latest
616+
docker tag ${GITHUBIMAGE}:amd64-${META_TAG} ${GITHUBIMAGE}:${META_TAG}
617+
docker tag ${GITHUBIMAGE}:arm32v7-${META_TAG} ${GITHUBIMAGE}:arm32v7-latest
618+
docker tag ${GITHUBIMAGE}:arm64v8-${META_TAG} ${GITHUBIMAGE}:arm64v8-latest
619+
docker push ${GITHUBIMAGE}:amd64-${META_TAG}
620+
docker push ${GITHUBIMAGE}:arm32v7-${META_TAG}
621+
docker push ${GITHUBIMAGE}:arm64v8-${META_TAG}
622+
docker push ${GITHUBIMAGE}:latest
623+
docker push ${GITHUBIMAGE}:${META_TAG}
624+
docker push ${GITHUBIMAGE}:arm32v7-latest
625+
docker push ${GITHUBIMAGE}:arm64v8-latest
645626
'''
646627
}
647628
sh '''#! /bin/bash
648-
for DELETEIMAGE in "${QUAYIMAGE}" "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
629+
for DELETEIMAGE in "${GITHUBIMAGE}" "${GITLABIMAGE}" "${IMAGE}"; do
649630
docker rmi \
650631
${DELETEIMAGE}:amd64-${META_TAG} \
651632
${DELETEIMAGE}:amd64-latest \

‎README.md‎

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[![linuxserver.io](https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/linuxserver_medium.png)](https://linuxserver.io)
22

3-
[![Blog](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
4-
[![Discord](https://img.shields.io/discord/354974912613449730.svg?style=flat-square&color=E68523&label=Discord&logo=discord&logoColor=FFFFFF)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
5-
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?style=flat-square&color=E68523&logo=discourse&logoColor=FFFFFF)](https://discourse.linuxserver.io "post on our community forum.")
6-
[![Fleet](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
7-
[![GitHub](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver "view the source for all of our repositories.")
8-
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?style=flat-square&color=E68523&label=Supporters&logo=open%20collective&logoColor=FFFFFF)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
3+
[![Blog](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Blog)](https://blog.linuxserver.io "all the things you can do with our containers including How-To guides, opinions and much more!")
4+
[![Discord](https://img.shields.io/discord/354974912613449730.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Discord&logo=discord)](https://discord.gg/YWrKVTn "realtime support / chat with the community and the team.")
5+
[![Discourse](https://img.shields.io/discourse/https/discourse.linuxserver.io/topics.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=discourse)](https://discourse.linuxserver.io "post on our community forum.")
6+
[![Fleet](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=Fleet)](https://fleet.linuxserver.io "an online web interface which displays all of our maintained images.")
7+
[![GitHub](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub&logo=github)](https://github.com/linuxserver "view the source for all of our repositories.")
8+
[![Open Collective](https://img.shields.io/opencollective/all/linuxserver.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=Supporters&logo=open%20collective)](https://opencollective.com/linuxserver "please consider helping us by either donating or contributing to our budget")
99

1010
The [LinuxServer.io](https://linuxserver.io) team brings you another container release featuring:
1111

@@ -25,16 +25,15 @@ Find us at:
2525

2626
# [linuxserver/wireguard](https://github.com/linuxserver/docker-wireguard)
2727

28-
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-wireguard.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-wireguard)
29-
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-wireguard.svg?style=flat-square&color=E68523&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-wireguard/releases)
30-
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitHub%20Package&logo=github&logoColor=FFFFFF)](https://github.com/linuxserver/docker-wireguard/packages)
31-
[![GitLab Container Registry](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=GitLab%20Registry&logo=gitlab&logoColor=FFFFFF)](https://gitlab.com/Linuxserver.io/docker-wireguard/container_registry)
32-
[![Quay.io](https://img.shields.io/static/v1.svg?style=flat-square&color=E68523&label=linuxserver.io&message=Quay.io)](https://quay.io/repository/linuxserver.io/wireguard)
33-
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/wireguard.svg?style=flat-square&color=E68523)](https://microbadger.com/images/linuxserver/wireguard "Get your own version badge on microbadger.com")
34-
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/wireguard.svg?style=flat-square&color=E68523&label=pulls&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/wireguard)
35-
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/wireguard.svg?style=flat-square&color=E68523&label=stars&logo=docker&logoColor=FFFFFF)](https://hub.docker.com/r/linuxserver/wireguard)
36-
[![Build Status](https://ci.linuxserver.io/view/all/job/Docker-Pipeline-Builders/job/docker-wireguard/job/master/badge/icon?style=flat-square)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-wireguard/job/master/)
37-
[![](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/wireguard/latest/badge.svg)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/wireguard/latest/index.html)
28+
[![GitHub Stars](https://img.shields.io/github/stars/linuxserver/docker-wireguard.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-wireguard)
29+
[![GitHub Release](https://img.shields.io/github/release/linuxserver/docker-wireguard.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&logo=github)](https://github.com/linuxserver/docker-wireguard/releases)
30+
[![GitHub Package Repository](https://img.shields.io/static/v1.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=linuxserver.io&message=GitHub%20Package&logo=github)](https://github.com/linuxserver/docker-wireguard/packages)
31+
[![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-wireguard/container_registry)
32+
[![MicroBadger Layers](https://img.shields.io/microbadger/layers/linuxserver/wireguard.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge)](https://microbadger.com/images/linuxserver/wireguard "Get your own version badge on microbadger.com")
33+
[![Docker Pulls](https://img.shields.io/docker/pulls/linuxserver/wireguard.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=pulls&logo=docker)](https://hub.docker.com/r/linuxserver/wireguard)
34+
[![Docker Stars](https://img.shields.io/docker/stars/linuxserver/wireguard.svg?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=stars&logo=docker)](https://hub.docker.com/r/linuxserver/wireguard)
35+
[![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-wireguard%2Fjob%2Fmaster%2F&logo=jenkins)](https://ci.linuxserver.io/job/Docker-Pipeline-Builders/job/docker-wireguard/job/master/)
36+
[![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%2Flsio-ci.ams3.digitaloceanspaces.com%2Flspipepr%2Fwireguard%2Flatest%2Fci-status.yml)](https://lsio-ci.ams3.digitaloceanspaces.com/linuxserver/wireguard/latest/index.html)
3837

3938
[WireGuard®](https://www.wireguard.com/) is an extremely simple yet fast and modern VPN that utilizes state-of-the-art cryptography. It aims to be faster, simpler, leaner, and more useful than IPsec, while avoiding the massive headache. It intends to be considerably more performant than OpenVPN. WireGuard is designed as a general purpose VPN for running on embedded interfaces and super computers alike, fit for many different circumstances. Initially released for the Linux kernel, it is now cross-platform (Windows, macOS, BSD, iOS, Android) and widely deployable. It is currently under heavy development, but already it might be regarded as the most secure, easiest to use, and simplest VPN solution in the industry.
4039

@@ -137,7 +136,7 @@ Container images are configured using parameters passed at runtime (such as thos
137136

138137
## Environment variables from files (Docker secrets)
139138

140-
You can set any environment variable from a file by using a special prepend `FILE__`.
139+
You can set any environment variable from a file by using a special prepend `FILE__`.
141140

142141
As an example:
143142

@@ -147,6 +146,11 @@ As an example:
147146

148147
Will set the environment variable `PASSWORD` based on the contents of the `/run/secrets/mysecretpassword` file.
149148

149+
## Umask for running applications
150+
151+
For all of our images we provide the ability to override the default umask settings for services started within the containers using the optional `-e UMASK=022` setting.
152+
Keep in mind umask is not chmod it subtracts from permissions based on it's value it does not add. Please read up [here](https://en.wikipedia.org/wiki/Umask) before asking for support.
153+
150154
## User / Group Identifiers
151155

152156
When using volumes (`-v` flags) permissions issues can arise between the host OS and the container, we avoid this issue by allowing you to specify the user `PUID` and group `PGID`.
@@ -195,7 +199,7 @@ Both of these approaches have positives and negatives however their setup is out
195199

196200

197201
## Docker Mods
198-
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?style=for-the-badge&color=E68523&label=mods&query=%24.mods%5B%27wireguard%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=wireguard "view available mods for this container.")
202+
[![Docker Mods](https://img.shields.io/badge/dynamic/yaml?color=94398d&labelColor=555555&logoColor=ffffff&style=for-the-badge&label=mods&query=%24.mods%5B%27wireguard%27%5D.mod_count&url=https%3A%2F%2Fraw.githubusercontent.com%2Flinuxserver%2Fdocker-mods%2Fmaster%2Fmod-list.yml)](https://mods.linuxserver.io/?mod=wireguard "view available mods for this container.")
199203

200204
We publish various [Docker Mods](https://github.com/linuxserver/docker-mods) to enable additional functionality within the containers. The list of Mods available for this image (if any) can be accessed via the dynamic badge above.
201205

@@ -264,6 +268,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
264268

265269
## Versions
266270

271+
* **29.05.20:** - Add support for 64bit raspbian.
267272
* **28.04.20:** - Add Buster/Stretch backports repos for Debian. Tested with OMV 5 and OMV 4 (on kernel 4.19.0-0.bpo.8-amd64).
268273
* **20.04.20:** - Fix typo in client mode conf existence check.
269274
* **13.04.20:** - Fix bug that forced conf recreation on every start.

‎readme-vars.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ app_setup_block: |
8585
8686
# changelog
8787
changelogs:
88+
- { date: "29.05.20:", desc: "Add support for 64bit raspbian." }
8889
- { date: "28.04.20:", desc: "Add Buster/Stretch backports repos for Debian. Tested with OMV 5 and OMV 4 (on kernel 4.19.0-0.bpo.8-amd64)." }
8990
- { date: "20.04.20:", desc: "Fix typo in client mode conf existence check." }
9091
- { date: "13.04.20:", desc: "Fix bug that forced conf recreation on every start." }

‎root/etc/cont-init.d/30-config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ if apt-cache show linux-headers-$(uname -r) 2&>1 >/dev/null; then
88
apt-get install -y \
99
linux-headers-$(uname -r) \
1010
wireguard
11-
elif (uname -r | grep -q 'v7+') || (uname -r | grep -q 'v7l+'); then
11+
elif (uname -r | grep -q 'v7+') || (uname -r | grep -q 'v7l+') || (uname -r | grep -q 'v8+'); then
1212
echo "Raspbian kernel naming convention detected, attempting to install raspbian kernel headers"
1313
curl -s http://archive.raspberrypi.org/debian/raspberrypi.gpg.key | apt-key add -
1414
echo -e \
@@ -176,7 +176,7 @@ if [ -n "$PEERS" ]; then
176176
else
177177
echo "Client mode selected."
178178
if [ ! -f /config/wg0.conf ]; then
179-
"No client conf found. Provide your own client conf as \"/config/wg0.conf\" and restart the container."
179+
echo "No client conf found. Provide your own client conf as \"/config/wg0.conf\" and restart the container."
180180
sleep infinity
181181
fi
182182
fi

0 commit comments

Comments
 (0)