Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'docker/develop/Dockerfile')
-rw-r--r--docker/develop/Dockerfile18
1 files changed, 6 insertions, 12 deletions
diff --git a/docker/develop/Dockerfile b/docker/develop/Dockerfile
index cf51b3fb8..45617302d 100644
--- a/docker/develop/Dockerfile
+++ b/docker/develop/Dockerfile
@@ -1,13 +1,13 @@
-FROM ruby:2.4.4-slim-stretch
+FROM ruby:2.6-slim-buster
RUN DEBIAN_FRONTEND=noninteractive \
apt-get update && \
- apt-get install -y -qq \
+ apt-get install -y -qq --no-install-recommends \
build-essential \
cmake \
curl \
- ghostscript \
git \
+ gsfonts \
imagemagick \
libcurl4-openssl-dev \
libidn11-dev \
@@ -16,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
libpq-dev \
libssl-dev \
libxml2-dev \
- libxslt-dev \
+ libxslt1-dev \
nodejs \
gosu \
&& \
@@ -27,7 +27,8 @@ ARG DIA_UID
ARG DIA_GID
ENV HOME="/home/diaspora" \
- GEM_HOME="/diaspora/vendor/bundle"
+ GEM_HOME="/diaspora/vendor/bundle" \
+ OPENSSL_CONF="/etc/ssl/"
RUN addgroup --gid $DIA_GID diaspora && \
adduser \
@@ -42,13 +43,6 @@ RUN addgroup --gid $DIA_GID diaspora && \
chown -R diaspora:diaspora $HOME /diaspora
-RUN curl -L \
- https://cifiles.diasporafoundation.org/phantomjs-2.1.1-linux-x86_64.tar.bz2 \
- | tar -xj -C /usr/local/bin \
- --transform='s#.*/##' \
- phantomjs-2.1.1-linux-x86_64/bin/phantomjs
-
-
ENV BUNDLE_PATH="$GEM_HOME" \
BUNDLE_BIN="$GEM_HOME/bin" \
BUNDLE_APP_CONFIG="/diaspora/.bundle"