From f21918c58867160f1b1733ea0bec3828cec0071e Mon Sep 17 00:00:00 2001
From: Niaz Faridani-Rad <faridani.rad@gmail.com>
Date: Sun, 25 Jul 2021 11:54:10 +0200
Subject: [PATCH] Revert to buster python image
---
backend/Dockerfile | 12 ++----------
docker-compose.yml | 2 +-
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/backend/Dockerfile b/backend/Dockerfile
index 4af4e02..ea57082 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 8721e75..6b1a2e0 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
--
GitLab