Upgrade dev docker environment to 22.04 (#492)

* make docker user's home directory executable to allow running tests
MarkUsProject · Apr 9, 2024 · f2bfa61 · f2bfa61
1 parent a85cdf8
commit f2bfa61
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/client/.dockerfiles/Dockerfile b/client/.dockerfiles/Dockerfile
@@ -3,9 +3,9 @@ ARG UBUNTU_VERSION
 FROM ubuntu:$UBUNTU_VERSION
 
 RUN apt-get update -y && \
-    apt-get -y install software-properties-common && \
-    add-apt-repository -y ppa:deadsnakes/ppa && \
-    apt-get install -y python3.11 python3.11-venv
+    DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
+    DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y python3.11 python3.11-venv
 
 COPY ./requirements.txt /requirements.txt
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
       context: ./server
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '20.04'
+        UBUNTU_VERSION: '22.04'
         LOGIN_USER: 'docker'
         WORKSPACE: '/home/docker/.autotesting'
     image: markus-autotest-server-dev:1.1.0
@@ -28,7 +28,7 @@ services:
       context: ./client
       dockerfile: ./.dockerfiles/Dockerfile
       args:
-        UBUNTU_VERSION: '20.04'
+        UBUNTU_VERSION: '22.04'
     image: markus-autotest-client-dev:1.1.0
     container_name: 'autotest-client'
     volumes:

diff --git a/server/.dockerfiles/Dockerfile b/server/.dockerfiles/Dockerfile
@@ -2,15 +2,14 @@ ARG UBUNTU_VERSION
 
 FROM ubuntu:$UBUNTU_VERSION as base
 
-ENV DEBIAN_FRONTEND=noninteractive 
 
 ARG LOGIN_USER
 ARG WORKSPACE
 
 RUN apt-get update -y && \
-    apt-get -y install software-properties-common && \
-    add-apt-repository -y ppa:deadsnakes/ppa && \
-    apt-get -y install python3.7 \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
+    DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7 \
                        python3.7-venv \
                        python3.8 \
                        python3.8-venv \
@@ -36,6 +35,8 @@ RUN useradd -ms /bin/bash $LOGIN_USER && \
         usermod -aG $worker $LOGIN_USER; \
     done
 
+RUN chmod a+x /home/${LOGIN_USER}
+
 COPY . /app
 
 RUN python3.11 -m venv /markus_venv && \