Merge branch 'next-minor' into develop
This commit is contained in:
commit
9021583d37
1 changed files with 6 additions and 5 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Reference in a new issue