Skip to content

Commit f2bfa61

Browse files
authored
Upgrade dev docker environment to 22.04 (#492)
* make docker user's home directory executable to allow running tests
1 parent a85cdf8 commit f2bfa61

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

client/.dockerfiles/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ ARG UBUNTU_VERSION
33
FROM ubuntu:$UBUNTU_VERSION
44

55
RUN apt-get update -y && \
6-
apt-get -y install software-properties-common && \
7-
add-apt-repository -y ppa:deadsnakes/ppa && \
8-
apt-get install -y python3.11 python3.11-venv
6+
DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
7+
DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
8+
DEBIAN_FRONTEND=noninteractive apt-get install -y python3.11 python3.11-venv
99

1010
COPY ./requirements.txt /requirements.txt
1111

docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services:
66
context: ./server
77
dockerfile: ./.dockerfiles/Dockerfile
88
args:
9-
UBUNTU_VERSION: '20.04'
9+
UBUNTU_VERSION: '22.04'
1010
LOGIN_USER: 'docker'
1111
WORKSPACE: '/home/docker/.autotesting'
1212
image: markus-autotest-server-dev:1.1.0
@@ -28,7 +28,7 @@ services:
2828
context: ./client
2929
dockerfile: ./.dockerfiles/Dockerfile
3030
args:
31-
UBUNTU_VERSION: '20.04'
31+
UBUNTU_VERSION: '22.04'
3232
image: markus-autotest-client-dev:1.1.0
3333
container_name: 'autotest-client'
3434
volumes:

server/.dockerfiles/Dockerfile

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,14 @@ ARG UBUNTU_VERSION
22

33
FROM ubuntu:$UBUNTU_VERSION as base
44

5-
ENV DEBIAN_FRONTEND=noninteractive
65

76
ARG LOGIN_USER
87
ARG WORKSPACE
98

109
RUN apt-get update -y && \
11-
apt-get -y install software-properties-common && \
12-
add-apt-repository -y ppa:deadsnakes/ppa && \
13-
apt-get -y install python3.7 \
10+
DEBIAN_FRONTEND=noninteractive apt-get -y install software-properties-common && \
11+
DEBIAN_FRONTEND=noninteractive add-apt-repository -y ppa:deadsnakes/ppa && \
12+
DEBIAN_FRONTEND=noninteractive apt-get -y install python3.7 \
1413
python3.7-venv \
1514
python3.8 \
1615
python3.8-venv \
@@ -36,6 +35,8 @@ RUN useradd -ms /bin/bash $LOGIN_USER && \
3635
usermod -aG $worker $LOGIN_USER; \
3736
done
3837

38+
RUN chmod a+x /home/${LOGIN_USER}
39+
3940
COPY . /app
4041

4142
RUN python3.11 -m venv /markus_venv && \

0 commit comments

Comments
 (0)