summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjwijenbergh <jeroenwijenbergh@protonmail.com>2022-11-03 17:14:58 +0100
committerjwijenbergh <jeroenwijenbergh@protonmail.com>2022-11-03 20:27:20 +0100
commit7fb6792a2d531eed4389a06255b0daca82d81d80 (patch)
tree42eebf22932dfd2a959030fae0453216e3f48432
parent6af2f953176d3eac71a95353c61804b997767460 (diff)
Docker: Use debian
For some reason GitHub was failing on the golang image but not locally??
-rw-r--r--ci/docker/go-test.docker12
1 files changed, 5 insertions, 7 deletions
diff --git a/ci/docker/go-test.docker b/ci/docker/go-test.docker
index 6758859..e990521 100644
--- a/ci/docker/go-test.docker
+++ b/ci/docker/go-test.docker
@@ -1,14 +1,12 @@
-FROM golang:1.19
+FROM debian:bullseye
# This docker image is for testing the go code with go test and the needed dependencies for selenium
WORKDIR /eduvpn
-# Selenium dependencies
-# Firefox
-RUN echo "deb http://deb.debian.org/debian/ unstable main contrib non-free" >> /etc/apt/sources.list.d/debian.list
+# Dependencies
RUN apt-get update
-RUN apt-get -y install openjdk-11-jre xvfb python3-selenium firefox python3-pip
+RUN apt-get -y install openjdk-11-jre xvfb python3-selenium firefox-esr python3-pip golang wget
# Install geckodriver and add to path
WORKDIR /eduvpn/vendor
@@ -29,8 +27,8 @@ WORKDIR /home/test
# Copy sources with correct permissions
COPY --chown=test:test . ./
-# Download and verify go dependencies
-RUN go mod download && go mod verify
+# Vendor go dependencies
+RUN go mod vendor
# Clean because there might be previous builds copied over
RUN make clean