nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2020-11-04 14:22:29 +01:00
commit 9021583d37
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
docker/develop/Dockerfile
View file

@ -1,13 +1,13 @@
FROM ruby:2.4.4-slim-stretch FROM ruby:2.6-slim-buster
RUN DEBIAN_FRONTEND=noninteractive \ RUN DEBIAN_FRONTEND=noninteractive \
apt-get update && \ apt-get update && \
apt-get install -y -qq \ apt-get install -y -qq --no-install-recommends \
build-essential \ build-essential \
cmake \ cmake \
curl \ curl \
ghostscript \
git \ git \
gsfonts \
imagemagick \ imagemagick \
libcurl4-openssl-dev \ libcurl4-openssl-dev \
libidn11-dev \ libidn11-dev \
@ -16,7 +16,7 @@ RUN DEBIAN_FRONTEND=noninteractive \
libpq-dev \ libpq-dev \
libssl-dev \ libssl-dev \
libxml2-dev \ libxml2-dev \
libxslt-dev \ libxslt1-dev \
nodejs \ nodejs \
gosu \ gosu \
&& \ && \
@ -27,7 +27,8 @@ ARG DIA_UID
ARG DIA_GID ARG DIA_GID
ENV HOME="/home/diaspora" \ ENV HOME="/home/diaspora" \
GEM_HOME="/diaspora/vendor/bundle" GEM_HOME="/diaspora/vendor/bundle" \
OPENSSL_CONF="/etc/ssl/"
RUN addgroup --gid $DIA_GID diaspora && \ RUN addgroup --gid $DIA_GID diaspora && \
adduser \ adduser \