diff --git a/backend/Dockerfile b/backend/Dockerfile index 4af4e02a94139a89f45dc1ac665f3e524ace9cfd..ea57082b9fa56572f7b881d0c205df48633d5520 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:groovy +FROM python:3.8-slim-buster # system packages installation RUN apt update && apt install -y ffmpeg libimage-exiftool-perl curl nfs-common cifs-utils libopenblas-dev libheif-dev libmagic1 libraw-dev libboost-all-dev libxrender-dev liblapack-dev git bzip2 cmake build-essential libsm6 libglib2.0-dev libgl1-mesa-glx libpq-dev libexpat-dev \ @@ -20,16 +20,8 @@ RUN apt update && apt install -y ffmpeg libimage-exiftool-perl curl nfs-common c libtool-bin \ wget \ libwebp-dev --no-install-recommends -#Build and install python -RUN apt-get update \ - && apt-get install -y python3-pip python3-dev \ - && cd /usr/local/bin \ - && ln -s /usr/bin/python3 python \ - && pip3 install --upgrade pip #Build and install libraw -#RUN mkdir /libraw -#RUN curl -SL https://www.libraw.org/data/LibRaw-0.20.2.tar.gz | tar -zxC /libraw RUN git clone https://github.com/LibRaw/LibRaw RUN ls WORKDIR /LibRaw @@ -42,7 +34,7 @@ RUN make install WORKDIR / RUN mkdir /imagemagick RUN curl -SL https://www.imagemagick.org/download/ImageMagick.tar.gz | tar -zxC /imagemagick -WORKDIR /imagemagick/ImageMagick-7.1.0-2 +WORKDIR /imagemagick/ImageMagick-7.1.0-4 RUN ./configure --with-modules RUN make install RUN ldconfig /usr/local/lib diff --git a/docker-compose.yml b/docker-compose.yml index 8721e75939d4f8a32e0ba920f9a4265112e03522..6b1a2e057fc41fb0260f85496ae08400df1c17c7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -39,7 +39,7 @@ services: - backend backend: - image: reallibrephotos/librephotos-backend:${tag} + image: reallibrephotos/librephotos:${tag} restart: always volumes: - ${myPhotos}:/data