Skip to content

Commit

Permalink
migrated docker-image to ubuntu:focal baseimage for arm64 support
Browse files Browse the repository at this point in the history
  • Loading branch information
fabianbees committed Jul 9, 2021
1 parent 713aaed commit 0819501
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
CI_BUILD_IMAGE: "docker:latest"
CI_BUILD_AMD64: "enabled"
CI_BUILD_ARM64: ""
CI_BUILD_ARM64: "enabled"
CI_BUILD_ARMv7: ""
# For using DOCKER_HUB as registry, set this Var to "true"
DOCKER_HUB: "true"
Expand Down
20 changes: 9 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
#FROM ghcr.io/linuxserver/baseimage-ubuntu:bionic
FROM ghcr.io/linuxserver/baseimage-ubuntu:focal

# set version label
ARG BUILD_DATE
Expand All @@ -22,25 +23,22 @@ RUN \
libatm1 \
libelf1 \
libexpat1 \
libip4tc0 \
libip6tc0 \
libiptc0 \
liblzo2-2 \
libmagic-mgc \
libmagic1 \
libmariadb3 \
libmnl0 \
libmpdec2 \
libmysqlclient20 \
libmysqlclient21 \
libnetfilter-conntrack3 \
libnfnetlink0 \
libpcap0.8 \
libpython3-stdlib \
libpython3.6-minimal \
libpython3.6-stdlib \
libpython3.8-minimal \
libpython3.8-stdlib \
libxtables12 \
mime-support \
multiarch-support \
mysql-common \
net-tools \
python3 \
Expand All @@ -56,15 +54,15 @@ RUN \
python3-sqlalchemy \
python3-sqlparse \
python3-tempita \
python3.6 \
python3.6-minimal \
python3.8 \
python3.8-minimal \
sqlite3 \
xz-utils && \
echo "**** add openvpn-as repo ****" && \
curl -s https://as-repository.openvpn.net/as-repo-public.gpg | apt-key add - && \
echo "deb http://as-repository.openvpn.net/as/debian bionic main">/etc/apt/sources.list.d/openvpn-as-repo.list && \
echo "deb http://as-repository.openvpn.net/as/debian focal main">/etc/apt/sources.list.d/openvpn-as-repo.list && \
if [ -z ${OPENVPNAS_VERSION+x} ]; then \
OPENVPNAS_VERSION=$(curl -sX GET http://as-repository.openvpn.net/as/debian/dists/bionic/main/binary-amd64/Packages.gz | gunzip -c \
OPENVPNAS_VERSION=$(curl -sX GET http://as-repository.openvpn.net/as/debian/dists/focal/main/binary-amd64/Packages.gz | gunzip -c \
|grep -A 7 -m 1 "Package: openvpn-as" | awk -F ": " '/Version/{print $2;exit}');\
fi && \
echo "$OPENVPNAS_VERSION" > /version.txt && \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ The architectures supported by this image are:
| Architecture | Tag |
| :----: | --- |
| x86-64 | latest |
| arm64 | latest |

## Version Tags

Expand Down

0 comments on commit 0819501

Please sign in to comment.