From 5c355cce4c2058875681e49638edd17c5411246d Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 28 Jan 2020 21:11:48 -0600 Subject: [PATCH] Update to 19.10 --- container/Dockerfile | 14 +++++++------- container/Dockerfile-deps | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/container/Dockerfile b/container/Dockerfile index 6bfd54f4a..010227fe6 100644 --- a/container/Dockerfile +++ b/container/Dockerfile @@ -10,7 +10,7 @@ RUN cd /opt/mastodon && \ bundle install --without development test --with production && \ yarn install --pure-lockfile -FROM amd64/ubuntu:18.04 +FROM amd64/ubuntu:19.10 # Copy over all the langs needed for runtime 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 ARG UID=1001 ARG GID=1001 -RUN apt update && \ +RUN apt-get update && \ echo "Etc/UTC" > /etc/localtime && \ ln -s /opt/jemalloc/lib/* /usr/lib/ && \ - apt install -y whois wget && \ + apt-get install -y whois wget && \ addgroup --gid $GID 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 # Install mastodon runtime deps -RUN apt -y --no-install-recommends install \ +RUN apt-get -y --no-install-recommends install \ libssl1.1 libpq5 imagemagick ffmpeg \ - libicu60 libprotobuf10 libidn11 libyaml-0-2 \ - file ca-certificates tzdata libreadline7 && \ - apt -y install gcc && \ + libicu63 libprotobuf17 libidn11 libyaml-0-2 \ + file ca-certificates tzdata libreadline8 && \ + apt-get -y install gcc && \ ln -s /opt/mastodon /mastodon && \ gem install bundler diff --git a/container/Dockerfile-deps b/container/Dockerfile-deps index 5090792f8..e37f6448d 100644 --- a/container/Dockerfile-deps +++ b/container/Dockerfile-deps @@ -1,4 +1,4 @@ -FROM amd64/ubuntu:18.04 +FROM amd64/ubuntu:19.10 # Install Node ENV NODE_VER="12.11.1"