diff --git a/.docker/Dockerfile b/.docker/Dockerfile index 28968135a6da9605be7a1f677f95fe77b18ff3cf..61c6d62f81ecd8e3f8c5a66cfd999a5121f757ad 100644 --- a/.docker/Dockerfile +++ b/.docker/Dockerfile @@ -1,9 +1,5 @@ FROM debian:bookworm -# change to bash default for gitlab runner -RUN unlink /bin/sh -RUN ln -s /bin/bash /bin/sh - RUN apt-get update RUN apt-get install -y cmake RUN apt-get install -y lcov @@ -13,11 +9,8 @@ RUN apt-get install -y python3-pip python3-venv RUN apt-get install -y git RUN apt-get install -y curl zip unzip tar RUN apt-get install -y perl pkg-config - - RUN apt-get install -y openjdk-17-jdk-headless - WORKDIR / RUN python3 -m venv ./venv RUN . ./venv/bin/activate @@ -27,9 +20,7 @@ COPY requirements.txt build-requirements.txt RUN ./venv/bin/pip install -r build-requirements.txt RUN ./venv/bin/conan profile detect -# add venv with conan to .bashrc -RUN echo "source /venv/bin/activate" >> /root/.bashrc - +ENV PATH=/venv/bin:$PATH COPY . /libcaosdb/ WORKDIR /libcaosdb