Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade dev docker environment to 22.04 #492

Merged
merged 2 commits into from
Apr 9, 2024
Merged

Upgrade dev docker environment to 22.04 #492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3d0c0e4
in progress upgrade to 22.04
pretendWhale Feb 27, 2024
ed936ff
make docker user's home directory executable to allow running tests
pretendWhale Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions client/.dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand Down
9 changes: 5 additions & 4 deletions server/.dockerfiles/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 && \
Expand Down
Loading