From 3d0c0e43fb8eb78491ffb68384f57cb97132e272 Mon Sep 17 00:00:00 2001
From: Samuel Maldonado <sam.maldonado@cognitivescience.co>
Date: Tue, 27 Feb 2024 16:52:30 -0500
Subject: [PATCH 1/2] in progress upgrade to 22.04

---
 client/.dockerfiles/Dockerfile | 6 +++---
 docker-compose.yml             | 4 ++--
 server/.dockerfiles/Dockerfile | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/client/.dockerfiles/Dockerfile b/client/.dockerfiles/Dockerfile
index ed3a0839..f7695774 100644
--- 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
index fbc3fc49..90b52b1c 100644
--- 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
index 652ca6ac..1b371543 100644
--- a/server/.dockerfiles/Dockerfile
+++ b/server/.dockerfiles/Dockerfile
@@ -8,9 +8,9 @@ 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 \

From ed936ff159ba701d3cd1800e002159557421ad9b Mon Sep 17 00:00:00 2001
From: Samuel Maldonado <sam.maldonado@cognitivescience.co>
Date: Mon, 8 Apr 2024 17:34:31 -0400
Subject: [PATCH 2/2] make docker user's home directory executable to allow
 running tests

---
 server/.dockerfiles/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/server/.dockerfiles/Dockerfile b/server/.dockerfiles/Dockerfile
index 1b371543..73a185ea 100644
--- a/server/.dockerfiles/Dockerfile
+++ b/server/.dockerfiles/Dockerfile
@@ -2,7 +2,6 @@ ARG UBUNTU_VERSION
 
 FROM ubuntu:$UBUNTU_VERSION as base
 
-ENV DEBIAN_FRONTEND=noninteractive 
 
 ARG LOGIN_USER
 ARG WORKSPACE
@@ -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 && \