|
|
@ -1,11 +1,11 @@ |
|
|
|
FROM ubuntu:18.04 as build-dep |
|
|
|
FROM ubuntu:20.04 as build-dep |
|
|
|
|
|
|
|
|
|
|
|
# Use bash for the shell |
|
|
|
# Use bash for the shell |
|
|
|
SHELL ["bash", "-c"] |
|
|
|
SHELL ["bash", "-c"] |
|
|
|
|
|
|
|
|
|
|
|
# Install Node v12 (LTS) |
|
|
|
# Install Node v12 (LTS) |
|
|
|
ENV NODE_VER="12.16.1" |
|
|
|
ENV NODE_VER="12.16.3" |
|
|
|
RUN ARCH= && \ |
|
|
|
RUN ARCH= && \ |
|
|
|
dpkgArch="$(dpkg --print-architecture)" && \ |
|
|
|
dpkgArch="$(dpkg --print-architecture)" && \ |
|
|
|
case "${dpkgArch##*-}" in \ |
|
|
|
case "${dpkgArch##*-}" in \ |
|
|
|
amd64) ARCH='x64';; \ |
|
|
|
amd64) ARCH='x64';; \ |
|
|
@ -74,7 +74,7 @@ RUN cd /opt/mastodon && \ |
|
|
|
bundle install -j$(nproc) && \ |
|
|
|
bundle install -j$(nproc) && \ |
|
|
|
yarn install --pure-lockfile |
|
|
|
yarn install --pure-lockfile |
|
|
|
|
|
|
|
|
|
|
|
FROM ubuntu:18.04 |
|
|
|
FROM ubuntu:20.04 |
|
|
|
|
|
|
|
|
|
|
|
# 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 |
|
|
@ -98,8 +98,8 @@ RUN apt update && \ |
|
|
|
# Install mastodon runtime deps |
|
|
|
# Install mastodon runtime deps |
|
|
|
RUN apt -y --no-install-recommends install \ |
|
|
|
RUN apt -y --no-install-recommends install \ |
|
|
|
libssl1.1 libpq5 imagemagick ffmpeg \ |
|
|
|
libssl1.1 libpq5 imagemagick ffmpeg \ |
|
|
|
libicu60 libprotobuf10 libidn11 libyaml-0-2 \ |
|
|
|
libicu66 libprotobuf17 libidn11 libyaml-0-2 \ |
|
|
|
file ca-certificates tzdata libreadline7 && \ |
|
|
|
file ca-certificates tzdata libreadline8 && \ |
|
|
|
apt -y install gcc && \ |
|
|
|
apt -y install gcc && \ |
|
|
|
ln -s /opt/mastodon /mastodon && \ |
|
|
|
ln -s /opt/mastodon /mastodon && \ |
|
|
|
gem install bundler && \ |
|
|
|
gem install bundler && \ |
|
|
|