From 04e49f0f61397c782649607163534249b05e87ae Mon Sep 17 00:00:00 2001
From: jwijenbergh <jeroenwijenbergh@protonmail.com>
Date: Fri, 5 Jul 2024 14:34:31 +0200
Subject: Docker: Update to latest versions

---
 ci/docker/eduvpnserver.docker |  2 +-
 ci/docker/gotest.docker       | 15 ++++++++-------
 docker-compose.yml            |  2 --
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/ci/docker/eduvpnserver.docker b/ci/docker/eduvpnserver.docker
index d615918..2e942db 100644
--- a/ci/docker/eduvpnserver.docker
+++ b/ci/docker/eduvpnserver.docker
@@ -1,4 +1,4 @@
-FROM fedora:38
+FROM docker.io/library/fedora:40
 
 # This dockerfile was adapted from https://codeberg.og/eduvpn/deploy/src/branch/v3/deploy_fedora.sh
 # DO NOT USE THIS IN PRODUCTION, ONLY FOR TESTING
diff --git a/ci/docker/gotest.docker b/ci/docker/gotest.docker
index b2e0113..53d0da5 100644
--- a/ci/docker/gotest.docker
+++ b/ci/docker/gotest.docker
@@ -1,4 +1,4 @@
-FROM debian:bullseye
+FROM docker.io/library/debian:bookworm
 
 # This docker image is for testing the go code with go test and the needed dependencies for selenium
 
@@ -6,14 +6,14 @@ WORKDIR /eduvpn
 
 # Dependencies
 RUN apt-get update
-RUN apt-get -y install openjdk-11-jre xvfb python3-selenium firefox-esr python3-pip wget
+RUN apt-get -y install firefox-esr python3-selenium python3-build python3-pip python3.11-venv firefox-esr wget xvfb
 
 # Install go from go.dev
 # Get
-RUN wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz -O go.tar.gz
+RUN wget https://go.dev/dl/go1.22.5.linux-amd64.tar.gz -O go.tar.gz
 
 # Verify hash
-RUN echo "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742  go.tar.gz" | sha256sum --check
+RUN echo "904b924d435eaea086515bc63235b192ea441bd8c9b198c507e85009e6e4c7f0  go.tar.gz" | sha256sum --check
 
 # Untar
 RUN tar -C /usr/local -xzf go.tar.gz
@@ -23,8 +23,8 @@ ENV PATH="/usr/local/go/bin:$PATH"
 
 # Install geckodriver and add to path
 WORKDIR /eduvpn/vendor
-RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.30.0/geckodriver-v0.30.0-linux64.tar.gz
-RUN tar xzvf geckodriver-v0.30.0-linux64.tar.gz
+RUN wget https://github.com/mozilla/geckodriver/releases/download/v0.34.0/geckodriver-v0.34.0-linux64.tar.gz
+RUN tar xzvf geckodriver-v0.34.0-linux64.tar.gz
 ENV PATH="/eduvpn/vendor:$PATH"
 
 # Update certificates
@@ -53,7 +53,8 @@ RUN make build
 RUN make -C wrappers/python
 
 # Install python lib
-RUN pip3 install wrappers/python/dist/*.whl
+# who cares if we break the system here :^)
+RUN pip3 install --break-system-packages wrappers/python/dist/*.whl
 
 # Run the tests
 CMD ["make", "test"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 6483a7a..b7f0bd6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,3 @@
-version: '3'
-
 # Common environment vars
 # These are the credentials for the portal
 # And the URI of the server
-- 
cgit v1.2.3