diff options
| author | Shlee <github@shl.ee> | 2020-06-25 18:17:53 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 12:17:53 +0200 |
| commit | 9ea91bbf59df8140fcae9e64e8928eb5040ec85b (patch) | |
| tree | cdbc9c41ddbe3fc649f3c3833c15041e7fa4a7d3 | |
| parent | 370e38ee15da6ff0b85c048486b56b173c1d4b02 (diff) | |
Update Dockerfile (#13582)
| -rw-r--r-- | Dockerfile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Dockerfile b/Dockerfile index 0537d8fac..fa6abad5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM ubuntu:18.04 as build-dep +FROM ubuntu:20.04 as build-dep # Use bash for the shell SHELL ["bash", "-c"] # Install Node v12 (LTS) -ENV NODE_VER="12.16.1" -RUN ARCH= && \ +ENV NODE_VER="12.16.3" +RUN ARCH= && \ dpkgArch="$(dpkg --print-architecture)" && \ case "${dpkgArch##*-}" in \ amd64) ARCH='x64';; \ @@ -74,7 +74,7 @@ RUN cd /opt/mastodon && \ bundle install -j$(nproc) && \ yarn install --pure-lockfile -FROM ubuntu:18.04 +FROM ubuntu:20.04 # Copy over all the langs needed for runtime COPY --from=build-dep /opt/node /opt/node @@ -98,8 +98,8 @@ RUN apt update && \ # Install mastodon runtime deps RUN apt -y --no-install-recommends install \ libssl1.1 libpq5 imagemagick ffmpeg \ - libicu60 libprotobuf10 libidn11 libyaml-0-2 \ - file ca-certificates tzdata libreadline7 && \ + libicu66 libprotobuf17 libidn11 libyaml-0-2 \ + file ca-certificates tzdata libreadline8 && \ apt -y install gcc && \ ln -s /opt/mastodon /mastodon && \ gem install bundler && \ |