Skip to content

Commit db8e608

Browse files
aptalcaaptalca
authored
Merge pull request #193 from linuxserver/iptables-legacy
switch to iptables-legacy, update formatting
2 parents 51f6bda + 06f2db6 commit db8e608

File tree

5 files changed

+149
-144
lines changed

5 files changed

+149
-144
lines changed

‎Dockerfile‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,55 @@ LABEL maintainer="aptalca"
1010
ENV DEBIAN_FRONTEND="noninteractive"
1111

1212
RUN \
13-
echo "**** install dependencies ****" && \
14-
apt-get update && \
15-
apt-get install -y --no-install-recommends \
16-
bc \
17-
build-essential \
18-
curl \
19-
dkms \
20-
git \
21-
gnupg \
22-
ifupdown \
23-
iproute2 \
24-
iptables \
25-
iputils-ping \
26-
jq \
27-
libc6 \
28-
libelf-dev \
29-
net-tools \
30-
netcat \
31-
openresolv \
32-
perl \
33-
pkg-config \
34-
qrencode && \
35-
echo "**** install wireguard-tools ****" && \
36-
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
37-
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
38-
| jq -r .[0].name); \
39-
fi && \
40-
cd /app && \
41-
git clone https://git.zx2c4.com/wireguard-linux-compat && \
42-
git clone https://git.zx2c4.com/wireguard-tools && \
43-
cd wireguard-tools && \
44-
git checkout "${WIREGUARD_RELEASE}" && \
45-
make -C src -j$(nproc) && \
46-
make -C src install && \
47-
echo "**** install CoreDNS ****" && \
48-
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
49-
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
50-
curl -o \
51-
/tmp/coredns.tar.gz -L \
52-
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_amd64.tgz" && \
53-
tar xf \
54-
/tmp/coredns.tar.gz -C \
55-
/app && \
56-
echo "**** clean up ****" && \
57-
rm -rf \
58-
/tmp/* \
59-
/var/lib/apt/lists/* \
60-
/var/tmp/*
13+
echo "**** install dependencies ****" && \
14+
apt-get update && \
15+
apt-get install -y --no-install-recommends \
16+
bc \
17+
build-essential \
18+
curl \
19+
dkms \
20+
git \
21+
gnupg \
22+
ifupdown \
23+
iproute2 \
24+
iptables \
25+
iputils-ping \
26+
jq \
27+
libc6 \
28+
libelf-dev \
29+
net-tools \
30+
netcat \
31+
openresolv \
32+
perl \
33+
pkg-config \
34+
qrencode && \
35+
update-alternatives --set iptables /usr/sbin/iptables-legacy && \
36+
echo "**** install wireguard-tools ****" && \
37+
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
38+
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
39+
| jq -r .[0].name); \
40+
fi && \
41+
cd /app && \
42+
git clone https://git.zx2c4.com/wireguard-linux-compat && \
43+
git clone https://git.zx2c4.com/wireguard-tools && \
44+
cd wireguard-tools && \
45+
git checkout "${WIREGUARD_RELEASE}" && \
46+
make -C src -j$(nproc) && \
47+
make -C src install && \
48+
echo "**** install CoreDNS ****" && \
49+
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
50+
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
51+
curl -o \
52+
/tmp/coredns.tar.gz -L \
53+
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_amd64.tgz" && \
54+
tar xf \
55+
/tmp/coredns.tar.gz -C \
56+
/app && \
57+
echo "**** clean up ****" && \
58+
rm -rf \
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/*
6162

6263
# add local files
6364
COPY /root /

‎Dockerfile.aarch64‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,55 @@ LABEL maintainer="aptalca"
1010
ENV DEBIAN_FRONTEND="noninteractive"
1111

1212
RUN \
13-
echo "**** install dependencies ****" && \
14-
apt-get update && \
15-
apt-get install -y --no-install-recommends \
16-
bc \
17-
build-essential \
18-
curl \
19-
dkms \
20-
git \
21-
gnupg \
22-
ifupdown \
23-
iproute2 \
24-
iptables \
25-
iputils-ping \
26-
jq \
27-
libc6 \
28-
libelf-dev \
29-
net-tools \
30-
netcat \
31-
openresolv \
32-
perl \
33-
pkg-config \
34-
qrencode && \
35-
echo "**** install wireguard-tools ****" && \
36-
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
37-
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
38-
| jq -r .[0].name); \
39-
fi && \
40-
cd /app && \
41-
git clone https://git.zx2c4.com/wireguard-linux-compat && \
42-
git clone https://git.zx2c4.com/wireguard-tools && \
43-
cd wireguard-tools && \
44-
git checkout "${WIREGUARD_RELEASE}" && \
45-
make -C src -j$(nproc) && \
46-
make -C src install && \
47-
echo "**** install CoreDNS ****" && \
48-
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
49-
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
50-
curl -o \
51-
/tmp/coredns.tar.gz -L \
52-
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_arm64.tgz" && \
53-
tar xf \
54-
/tmp/coredns.tar.gz -C \
55-
/app && \
56-
echo "**** clean up ****" && \
57-
rm -rf \
58-
/tmp/* \
59-
/var/lib/apt/lists/* \
60-
/var/tmp/*
13+
echo "**** install dependencies ****" && \
14+
apt-get update && \
15+
apt-get install -y --no-install-recommends \
16+
bc \
17+
build-essential \
18+
curl \
19+
dkms \
20+
git \
21+
gnupg \
22+
ifupdown \
23+
iproute2 \
24+
iptables \
25+
iputils-ping \
26+
jq \
27+
libc6 \
28+
libelf-dev \
29+
net-tools \
30+
netcat \
31+
openresolv \
32+
perl \
33+
pkg-config \
34+
qrencode && \
35+
update-alternatives --set iptables /usr/sbin/iptables-legacy && \
36+
echo "**** install wireguard-tools ****" && \
37+
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
38+
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
39+
| jq -r .[0].name); \
40+
fi && \
41+
cd /app && \
42+
git clone https://git.zx2c4.com/wireguard-linux-compat && \
43+
git clone https://git.zx2c4.com/wireguard-tools && \
44+
cd wireguard-tools && \
45+
git checkout "${WIREGUARD_RELEASE}" && \
46+
make -C src -j$(nproc) && \
47+
make -C src install && \
48+
echo "**** install CoreDNS ****" && \
49+
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
50+
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
51+
curl -o \
52+
/tmp/coredns.tar.gz -L \
53+
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_arm64.tgz" && \
54+
tar xf \
55+
/tmp/coredns.tar.gz -C \
56+
/app && \
57+
echo "**** clean up ****" && \
58+
rm -rf \
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/*
6162

6263
# add local files
6364
COPY /root /

‎Dockerfile.armhf‎

Lines changed: 49 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,55 @@ LABEL maintainer="aptalca"
1010
ENV DEBIAN_FRONTEND="noninteractive"
1111

1212
RUN \
13-
echo "**** install dependencies ****" && \
14-
apt-get update && \
15-
apt-get install -y --no-install-recommends \
16-
bc \
17-
build-essential \
18-
curl \
19-
dkms \
20-
git \
21-
gnupg \
22-
ifupdown \
23-
iproute2 \
24-
iptables \
25-
iputils-ping \
26-
jq \
27-
libc6 \
28-
libelf-dev \
29-
net-tools \
30-
netcat \
31-
openresolv \
32-
perl \
33-
pkg-config \
34-
qrencode && \
35-
echo "**** install wireguard-tools ****" && \
36-
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
37-
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
38-
| jq -r .[0].name); \
39-
fi && \
40-
cd /app && \
41-
git clone https://git.zx2c4.com/wireguard-linux-compat && \
42-
git clone https://git.zx2c4.com/wireguard-tools && \
43-
cd wireguard-tools && \
44-
git checkout "${WIREGUARD_RELEASE}" && \
45-
make -C src -j$(nproc) && \
46-
make -C src install && \
47-
echo "**** install CoreDNS ****" && \
48-
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
49-
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
50-
curl -o \
51-
/tmp/coredns.tar.gz -L \
52-
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_arm.tgz" && \
53-
tar xf \
54-
/tmp/coredns.tar.gz -C \
55-
/app && \
56-
echo "**** clean up ****" && \
57-
rm -rf \
58-
/tmp/* \
59-
/var/lib/apt/lists/* \
60-
/var/tmp/*
13+
echo "**** install dependencies ****" && \
14+
apt-get update && \
15+
apt-get install -y --no-install-recommends \
16+
bc \
17+
build-essential \
18+
curl \
19+
dkms \
20+
git \
21+
gnupg \
22+
ifupdown \
23+
iproute2 \
24+
iptables \
25+
iputils-ping \
26+
jq \
27+
libc6 \
28+
libelf-dev \
29+
net-tools \
30+
netcat \
31+
openresolv \
32+
perl \
33+
pkg-config \
34+
qrencode && \
35+
update-alternatives --set iptables /usr/sbin/iptables-legacy && \
36+
echo "**** install wireguard-tools ****" && \
37+
if [ -z ${WIREGUARD_RELEASE+x} ]; then \
38+
WIREGUARD_RELEASE=$(curl -sX GET "https://api.github.com/repos/WireGuard/wireguard-tools/tags" \
39+
| jq -r .[0].name); \
40+
fi && \
41+
cd /app && \
42+
git clone https://git.zx2c4.com/wireguard-linux-compat && \
43+
git clone https://git.zx2c4.com/wireguard-tools && \
44+
cd wireguard-tools && \
45+
git checkout "${WIREGUARD_RELEASE}" && \
46+
make -C src -j$(nproc) && \
47+
make -C src install && \
48+
echo "**** install CoreDNS ****" && \
49+
COREDNS_VERSION=$(curl -sX GET "https://api.github.com/repos/coredns/coredns/releases/latest" \
50+
| awk '/tag_name/{print $4;exit}' FS='[""]' | awk '{print substr($1,2); }') && \
51+
curl -o \
52+
/tmp/coredns.tar.gz -L \
53+
"https://github.com/coredns/coredns/releases/download/v${COREDNS_VERSION}/coredns_${COREDNS_VERSION}_linux_arm.tgz" && \
54+
tar xf \
55+
/tmp/coredns.tar.gz -C \
56+
/app && \
57+
echo "**** clean up ****" && \
58+
rm -rf \
59+
/tmp/* \
60+
/var/lib/apt/lists/* \
61+
/var/tmp/*
6162

6263
# add local files
6364
COPY /root /

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
317317

318318
## Versions
319319

320+
* **09.10.22:** - Switch back to iptables-legacy due to issues on some hosts.
320321
* **04.10.22:** - Rebase to Jammy. Upgrade to s6v3.
321322
* **16.05.22:** - Improve NAT handling in server mode when multiple ethernet devices are present.
322323
* **23.04.22:** - Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes.

‎readme-vars.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@ app_setup_block: |
121121
122122
# changelog
123123
changelogs:
124+
- { date: "09.10.22:", desc: "Switch back to iptables-legacy due to issues on some hosts." }
124125
- { date: "04.10.22:", desc: "Rebase to Jammy. Upgrade to s6v3." }
125126
- { date: "16.05.22:", desc: "Improve NAT handling in server mode when multiple ethernet devices are present." }
126127
- { date: "23.04.22:", desc: "Add pre-shared key support. Automatically added to all new peer confs generated, existing ones are left without to ensure no breaking changes." }

0 commit comments

Comments
 (0)