asonix/mastodon
1
1
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Update to 19.10

Browse source
This commit is contained in:
asonix 2020-01-28 21:11:48 -06:00
parent 4fdf5fc0ae
commit 5c355cce4c
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
container/Dockerfile
View file

@ -10,7 +10,7 @@ RUN cd /opt/mastodon && \
bundle install --without development test --with production && \ bundle install --without development test --with production && \
yarn install --pure-lockfile yarn install --pure-lockfile
FROM amd64/ubuntu:18.04 FROM amd64/ubuntu:19.10
# Copy over all the langs needed for runtime # Copy over all the langs needed for runtime
COPY --from=build-dep /opt/node /opt/node COPY --from=build-dep /opt/node /opt/node
@ -26,20 +26,20 @@ ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin:/opt/mastodon/bin"
# Create the mastodon user # Create the mastodon user
ARG UID=1001 ARG UID=1001
ARG GID=1001 ARG GID=1001
RUN apt update && \ RUN apt-get update && \
echo "Etc/UTC" > /etc/localtime && \ echo "Etc/UTC" > /etc/localtime && \
ln -s /opt/jemalloc/lib/* /usr/lib/ && \ ln -s /opt/jemalloc/lib/* /usr/lib/ && \
apt install -y whois wget && \ apt-get install -y whois wget && \
addgroup --gid $GID mastodon && \ addgroup --gid $GID mastodon && \
useradd -m -u $UID -g $GID -d /opt/mastodon mastodon && \ useradd -m -u $UID -g $GID -d /opt/mastodon mastodon && \
echo "mastodon:`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256`" | chpasswd echo "mastodon:`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256`" | chpasswd
# Install mastodon runtime deps # Install mastodon runtime deps
RUN apt -y --no-install-recommends install \ RUN apt-get -y --no-install-recommends install \
libssl1.1 libpq5 imagemagick ffmpeg \ libssl1.1 libpq5 imagemagick ffmpeg \
libicu60 libprotobuf10 libidn11 libyaml-0-2 \ libicu63 libprotobuf17 libidn11 libyaml-0-2 \
file ca-certificates tzdata libreadline7 && \ file ca-certificates tzdata libreadline8 && \
apt -y install gcc && \ apt-get -y install gcc && \
ln -s /opt/mastodon /mastodon && \ ln -s /opt/mastodon /mastodon && \
gem install bundler gem install bundler

2
container/Dockerfile-deps
View file

@ -1,4 +1,4 @@
FROM amd64/ubuntu:18.04 FROM amd64/ubuntu:19.10
# Install Node # Install Node
ENV NODE_VER="12.11.1" ENV NODE_VER="12.11.1"