diff --git a/README.md b/README.md index 72f46d0..b0d8ddd 100644 --- a/README.md +++ b/README.md @@ -22,18 +22,18 @@ How to do it, you ask? Abandon all hope. Computers were a mistake. ```diff diff --git a/Dockerfile b/Dockerfile -index cbcdb2034..a159ee0de 100644 +index cbcdb2034..5dc1acc2f 100644 --- a/Dockerfile +++ b/Dockerfile -@@ -111,6 +111,8 @@ RUN cd ~ && \ - OTP_SECRET=precompile_placeholder SECRET_KEY_BASE=precompile_placeholder rails assets:precompile && \ - yarn cache clean +@@ -59,6 +59,8 @@ RUN cd /opt/mastodon && \ + bundle install -j"$(nproc)" && \ + yarn install --pure-lockfile -+RUN cat /etc/ssl/certs/ca-certificates.crt > vendor/bundle/ruby/2.7.0/gems/httpclient-2.8.3/lib/httpclient ++RUN cat /etc/ssl/certs/ca-certificates.crt > /opt/mastodon/vendor/bundle/ruby/2.7.0/gems/httpclient-2.8.3/lib/httpclient/cacert.pem + - # Set the work dir and the container entry point - WORKDIR /opt/mastodon - ENTRYPOINT ["/usr/bin/tini", "--"] + FROM ubuntu:20.04 + + # Copy over all the langs needed for runtime diff --git a/Gemfile.lock b/Gemfile.lock index a01341fc9..573c8e776 100644 --- a/Gemfile.lock