Skip to content

Commit

Permalink
Merge pull request #8 from secorolab/update-ubuntu
Browse files Browse the repository at this point in the history
Update Dockerfile to use Ubuntu 24.04
  • Loading branch information
Samuel-Wiest authored Jun 11, 2024
2 parents dba5dd7 + c9df010 commit b7510ec
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ name: Create and publish a Docker image
on:
push:
branches: ['main', 'docker']
tags:
- v*

# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
env:
Expand Down
10 changes: 7 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,24 @@
# syntax=docker/dockerfile:1

FROM ubuntu:20.04
FROM ubuntu:24.04
WORKDIR /usr/src/app

ENV DEBIAN_FRONTEND noninteractive
ENV VIRTUAL_ENV=/opt/venv

ARG PYTHON_VER_MAJ=3.7
ARG PYTHON_VER=3.7.17
ARG BLENDER_VERSION=3.0

RUN apt-get update
RUN apt-get install blender python3-pip -y
RUN pip3 install textX[cli] pyyaml matplotlib shapely
RUN apt-get install blender python3-pip python3-venv -y
RUN python3 -m venv $VIRTUAL_ENV
ENV PATH="$VIRTUAL_ENV/bin:$PATH"

COPY . .

RUN pip install -r requirements.txt

# Set python path for project src
ENV PYTHONPATH /usr/src/app/src

Expand Down
4 changes: 3 additions & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
matplotlib>=3.1.2
numpy>=1.17.4
textX==3.0.0
textX[cli]>=4.0.0
pyyaml
shapely

0 comments on commit b7510ec

Please sign in to comment.