Skip to content

Commit b9d1f1f

Browse files
3alpha3alpha
committed
Merge remote-tracking branch 'upstream/master' into 3alpha/updating-upstream
2 parents 6f16999 + 123c11b commit b9d1f1f

9 files changed

Lines changed: 212 additions & 239 deletions

File tree

‎Dockerfile‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,11 @@ RUN \
1515
apk add --no-cache --virtual=build-dependencies \
1616
build-base \
1717
elfutils-dev \
18-
gcc \
1918
git \
2019
linux-headers && \
2120
apk add --no-cache \
2221
bc \
2322
coredns \
24-
gnupg \
2523
grep \
2624
iproute2 \
2725
iptables \
@@ -30,8 +28,7 @@ RUN \
3028
libcap-utils \
3129
libqrencode \
3230
net-tools \
33-
openresolv \
34-
perl && \
31+
openresolv && \
3532
echo "wireguard" >> /etc/modules && \
3633
echo "**** install wireguard-tools ****" && \
3734
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
@@ -45,6 +42,8 @@ RUN \
4542
sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' src/wg-quick/linux.bash && \
4643
make -C src -j$(nproc) && \
4744
make -C src install && \
45+
rm -rf /etc/wireguard && \
46+
ln -s /config/wg_confs /etc/wireguard && \
4847
echo "**** clean up ****" && \
4948
apk del --no-network build-dependencies && \
5049
rm -rf \

‎Dockerfile.aarch64‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,11 @@ RUN \
1414
apk add --no-cache --virtual=build-dependencies \
1515
build-base \
1616
elfutils-dev \
17-
gcc \
1817
git \
1918
linux-headers && \
2019
apk add --no-cache \
2120
bc \
2221
coredns \
23-
gnupg \
2422
grep \
2523
iproute2 \
2624
iptables \
@@ -29,8 +27,7 @@ RUN \
2927
libcap-utils \
3028
libqrencode \
3129
net-tools \
32-
openresolv \
33-
perl && \
30+
openresolv && \
3431
echo "wireguard" >> /etc/modules && \
3532
echo "**** install wireguard-tools ****" && \
3633
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
@@ -44,6 +41,8 @@ RUN \
4441
sed -i 's|\[\[ $proto == -4 \]\] && cmd sysctl -q net\.ipv4\.conf\.all\.src_valid_mark=1|[[ $proto == -4 ]] \&\& [[ $(sysctl -n net.ipv4.conf.all.src_valid_mark) != 1 ]] \&\& cmd sysctl -q net.ipv4.conf.all.src_valid_mark=1|' src/wg-quick/linux.bash && \
4542
make -C src -j$(nproc) && \
4643
make -C src install && \
44+
rm -rf /etc/wireguard && \
45+
ln -s /config/wg_confs /etc/wireguard && \
4746
echo "**** clean up ****" && \
4847
apk del --no-network build-dependencies && \
4948
rm -rf \

‎README.md‎

Lines changed: 69 additions & 111 deletions
Large diffs are not rendered by default.

‎package_versions.txt‎

Lines changed: 15 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,20 +2,19 @@ NAME VERSION
22
alpine-baselayout 3.4.3-r1 apk
33
alpine-baselayout-data 3.4.3-r1 apk
44
alpine-keys 2.4-r1 apk
5-
alpine-release 3.18.4-r0 apk
5+
alpine-release 3.18.5-r0 apk
66
apk-tools 2.14.0-r2 apk
77
bash 5.2.15-r5 apk
88
bc 1.07.1-r4 apk
99
brotli-libs 1.0.9-r14 apk
10-
busybox 1.36.1-r2 apk
11-
busybox-binsh 1.36.1-r2 apk
10+
busybox 1.36.1-r5 apk
11+
busybox-binsh 1.36.1-r5 apk
1212
ca-certificates 20230506-r0 apk
1313
ca-certificates-bundle 20230506-r0 apk
1414
cloud.google.com/go/compute/metadata v0.2.3 go-module
15-
coredns 1.10.1-r6 apk
15+
coredns 1.10.1-r8 apk
1616
coreutils 9.3-r1 apk
17-
curl 8.3.0-r0 apk
18-
gdbm 1.23-r1 apk
17+
curl 8.5.0-r0 apk
1918
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible go-module
2019
github.com/Azure/go-autorest/autorest v0.11.28 go-module
2120
github.com/Azure/go-autorest/autorest/adal v0.9.18 go-module
@@ -94,14 +93,6 @@ github.com/prometheus/procfs v0.8.0
9493
github.com/secure-systems-lab/go-securesystemslib v0.4.0 go-module
9594
github.com/spf13/pflag v1.0.5 go-module
9695
github.com/tinylib/msgp v1.1.6 go-module
97-
gmp 6.2.1-r3 apk
98-
gnupg 2.4.3-r0 apk
99-
gnupg-dirmngr 2.4.3-r0 apk
100-
gnupg-gpgconf 2.4.3-r0 apk
101-
gnupg-keyboxd 2.4.3-r0 apk
102-
gnupg-utils 2.4.3-r0 apk
103-
gnupg-wks-client 2.4.3-r0 apk
104-
gnutls 3.8.0-r2 apk
10596
go.etcd.io/etcd/api/v3 v3.5.7 go-module
10697
go.etcd.io/etcd/client/pkg/v3 v3.5.7 go-module
10798
go.etcd.io/etcd/client/v3 v3.5.7 go-module
@@ -125,11 +116,6 @@ gopkg.in/DataDog/dd-trace-go.v1 v1.47.0
125116
gopkg.in/inf.v0 v0.9.1 go-module
126117
gopkg.in/yaml.v2 v2.4.0 go-module
127118
gopkg.in/yaml.v3 v3.0.1 go-module
128-
gpg 2.4.3-r0 apk
129-
gpg-agent 2.4.3-r0 apk
130-
gpg-wks-server 2.4.3-r0 apk
131-
gpgsm 2.4.3-r0 apk
132-
gpgv 2.4.3-r0 apk
133119
grep 3.10-r1 apk
134120
ip6tables 1.8.9-r2 apk
135121
iproute2 6.3.0-r0 apk
@@ -142,60 +128,47 @@ iputils-arping 20221126-r2
142128
iputils-clockdiff 20221126-r2 apk
143129
iputils-ping 20221126-r2 apk
144130
iputils-tracepath 20221126-r2 apk
145-
jq 1.6-r3 apk
131+
jq 1.6-r4 apk
146132
k8s.io/api v0.26.1 go-module
147133
k8s.io/apimachinery v0.26.1 go-module
148134
k8s.io/client-go v0.26.1 go-module
149135
k8s.io/klog/v2 v2.90.0 go-module
150136
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 go-module
151137
k8s.io/utils v0.0.0-20221107191617-1a15be271d1d go-module
152138
libacl 2.3.1-r3 apk
153-
libassuan 2.5.6-r0 apk
154139
libattr 2.5.1-r4 apk
155140
libbsd 0.11.7-r1 apk
156141
libbz2 1.0.8-r5 apk
157142
libc-utils 0.7.2-r5 apk
158143
libcap-utils 2.69-r0 apk
159144
libcap2 2.69-r0 apk
160-
libcrypto3 3.1.3-r0 apk
161-
libcurl 8.3.0-r0 apk
145+
libcrypto3 3.1.4-r3 apk
146+
libcurl 8.5.0-r0 apk
162147
libelf 0.189-r2 apk
163148
libevent 2.1.12-r6 apk
164-
libffi 3.4.4-r2 apk
165-
libgcrypt 1.10.2-r1 apk
166-
libgpg-error 1.47-r1 apk
167149
libidn2 2.3.4-r1 apk
168150
libintl 0.21.1-r7 apk
169-
libksba 1.6.4-r0 apk
170-
libldap 2.6.5-r0 apk
171151
libmd 1.0.4-r2 apk
172152
libmnl 1.0.5-r1 apk
173153
libncursesw 6.4_p20230506-r0 apk
174154
libnftnl 1.2.5-r1 apk
175155
libpng 1.6.39-r3 apk
176156
libproc2 4.0.4-r0 apk
177157
libqrencode 4.1.1-r1 apk
178-
libsasl 2.1.28-r4 apk
179-
libssl3 3.1.3-r0 apk
180-
libtasn1 4.19.0-r1 apk
158+
libssl3 3.1.4-r3 apk
181159
libunistring 1.1-r1 apk
182160
linux-pam 1.5.2-r10 apk
183161
mii-tool 2.10-r3 apk
184-
musl 1.2.4-r1 apk
162+
musl 1.2.4-r2 apk
185163
musl-fts 1.2.7-r5 apk
186-
musl-utils 1.2.4-r1 apk
164+
musl-utils 1.2.4-r2 apk
187165
ncurses-terminfo-base 6.4_p20230506-r0 apk
188166
net-tools 2.10-r3 apk
189167
netcat-openbsd 1.219-r1 apk
190-
nettle 3.8.1-r2 apk
191-
nghttp2-libs 1.55.1-r0 apk
192-
npth 1.6-r4 apk
168+
nghttp2-libs 1.57.0-r0 apk
193169
oniguruma 6.9.8-r1 apk
194170
openresolv 3.13.2-r0 apk
195-
p11-kit 0.24.1-r2 apk
196171
pcre2 10.42-r1 apk
197-
perl 5.36.1-r2 apk
198-
pinentry 1.2.1-r1 apk
199172
procps-ng 4.0.4-r0 apk
200173
readline 8.2.1-r1 apk
201174
scanelf 1.3.7-r1 apk
@@ -204,9 +177,9 @@ sigs.k8s.io/json v0.0.0-20220713155537-f
204177
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 go-module
205178
sigs.k8s.io/yaml v1.3.0 go-module
206179
skalibs 2.13.1.1-r1 apk
207-
sqlite-libs 3.41.2-r2 apk
208-
ssl_client 1.36.1-r2 apk
209-
tzdata 2023c-r1 apk
180+
ssl_client 1.36.1-r5 apk
181+
stdlib go1.20.11 go-module
182+
tzdata 2023d-r0 apk
210183
unbound-libs 1.17.1-r1 apk
211184
utmps-libs 0.1.2.1-r1 apk
212185
xz-libs 5.4.3-r0 apk

‎readme-vars.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,13 @@ app_setup_block: |
7878
7979
To display the QR codes of active peers again, you can use the following command and list the peer numbers as arguments: `docker exec -it wireguard /app/show-peer 1 4 5` or `docker exec -it wireguard /app/show-peer myPC myPhone myTablet` (Keep in mind that the QR codes are also stored as PNGs in the config folder).
8080
81-
The templates used for server and peer confs are saved under `/config/templates`. Advanced users can modify these templates and force conf generation by deleting `/config/wg0.conf` and restarting the container.
81+
The templates used for server and peer confs are saved under `/config/templates`. Advanced users can modify these templates and force conf generation by deleting `/config/wg_confs/wg0.conf` and restarting the container.
82+
83+
The container managed server conf is hardcoded to `wg0.conf`. However, the users can add additional tunnel config files with `.conf` extensions into `/config/wg_confs/` and the container will attempt to start them all in alphabetical order. If any one of the tunnels fail, they will all be stopped and the default route will be deleted, requiring user intervention to fix the invalid conf and a container restart.
8284
8385
## Client Mode
8486
85-
Do not set the `PEERS` environment variable. Drop your client conf into the config folder as `/config/wg0.conf` and start the container.
87+
Do not set the `PEERS` environment variable. Drop your client conf(s) into the config folder as `/config/wg_confs/<tunnel name>.conf` and start the container. If there are multiple tunnel configs, the container will attempt to start them all in alphabetical order. If any one of the tunnels fail, they will all be stopped and the default route will be deleted, requiring user intervention to fix the invalid conf and a container restart.
8688
8789
If you get IPv6 related errors in the log and connection cannot be established, edit the `AllowedIPs` line in your peer/client wg0.conf to include only `0.0.0.0/0` and not `::/0`; and restart the container.
8890
@@ -126,6 +128,7 @@ app_setup_block: |
126128
127129
# changelog
128130
changelogs:
131+
- { date: "03.10.23:", desc: "**Potentially Breaking Change:** Support for multiple interfaces added. Wireguard confs moved to `/config/wg_confs/`. Any file with a `.conf` extension in that folder will be treated as a live tunnel config and will be attempted to start. If any of the tunnels fail, all tunnels will be stopped. Tunnels are started in alphabetical order. Managed server conf will continue to be hardcoded to `wg0.conf`." }
129132
- { date: "28.06.23:", desc: "Rebase master to Alpine 3.18 again." }
130133
- { date: "26.06.23:", desc: "Revert master to Alpine 3.17, due to issue with openresolv." }
131134
- { date: "24.06.23:", desc: "Rebase master to Alpine 3.18, deprecate armhf as per [https://www.linuxserver.io/armhf](https://www.linuxserver.io/armhf)." }

‎root/app/show-peer‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ for i in "$@"; do
1313
PEER_ID="peer_${i//[^[:alnum:]_-]/}"
1414
fi
1515

16-
if grep -q "# ${PEER_ID}" /config/wg0.conf; then
16+
if grep -q "# ${PEER_ID}" /config/wg_confs/wg0.conf; then
1717
echo "PEER ${i} QR code:"
1818
qrencode -t ansiutf8 < /config/${PEER_ID}/${PEER_ID}.conf
1919
else

0 commit comments

Comments
 (0)