summaryrefslogtreecommitdiff
path: root/ci/docker
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-08-09 14:42:39 +0200
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-08-09 14:42:39 +0200
commit9abd93ee4d6345967c1b5aa1b220a5c2bd4b1f01 (patch)
tree6923b446517f571f3d7297e89ee4150389cde423 /ci/docker
parent196140a4cf34640ff963f2ae08dd135c3834f0d3 (diff)
Docker: Use the main eduVPN repo
Diffstat (limited to 'ci/docker')
-rw-r--r--ci/docker/eduvpn-server.docker13
1 files changed, 8 insertions, 5 deletions
diff --git a/ci/docker/eduvpn-server.docker b/ci/docker/eduvpn-server.docker
index c570ae3..ab45a48 100644
--- a/ci/docker/eduvpn-server.docker
+++ b/ci/docker/eduvpn-server.docker
@@ -16,14 +16,17 @@ WORKDIR /eduvpn/documentation
# Checkout v3 branch
RUN git checkout v3
-# Add dev package
-RUN echo -e '[eduVPN_v3-dev]\n\
-name=eduVPN 3.x Development Packages (Fedora $releasever)\n\
-baseurl=https://repo.tuxed.net/eduVPN/v3-dev/rpm/fedora-$releasever-$basearch\n\
+# import PGP key
+RUN rpm --import resources/repo+v3@eduvpn.org.asc
+
+# configure repository
+RUN echo -e '[eduVPN_v3]\n\
+name=eduVPN 3.x Packages (Fedora $releasever)\n\
+baseurl=https://repo.eduvpn.org/v3/rpm/fedora-$releasever-$basearch\n\
gpgcheck=1\n\
gpgkey=https://repo.tuxed.net/fkooman+repo@tuxed.net.asc\n\
enabled=1'\
->> /etc/yum.repos.d/eduVPN_v3-dev.repo
+>> /etc/yum.repos.d/eduVPN_v3.repo
# Install dependencies
RUN dnf -y install mod_ssl php-opcache httpd iptables-nft pwgen cronie \