From 9abd93ee4d6345967c1b5aa1b220a5c2bd4b1f01 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Tue, 9 Aug 2022 14:42:39 +0200 Subject: Docker: Use the main eduVPN repo --- ci/docker/eduvpn-server.docker | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'ci') 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 \ -- cgit v1.2.3