diff hacks
This commit is contained in:
parent
621074a75e
commit
3f4bf56ec8
42
README.md
42
README.md
|
@ -18,3 +18,45 @@ How to do it, you ask? Abandon all hope. Computers were a mistake.
|
||||||
1. Push the container & update the Co-op Cloud recipe (`compose.oidc.yml`)
|
1. Push the container & update the Co-op Cloud recipe (`compose.oidc.yml`)
|
||||||
1. Deploy the thing & pray
|
1. Deploy the thing & pray
|
||||||
1. Hope you never have to do this again
|
1. Hope you never have to do this again
|
||||||
|
|
||||||
|
### v3.4.6
|
||||||
|
|
||||||
|
```diff
|
||||||
|
diff --git a/Dockerfile b/Dockerfile
|
||||||
|
index cbcdb2034..a159ee0de 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
|
||||||
|
|
||||||
|
+RUN cat /etc/ssl/certs/ca-certificates.crt > vendor/bundle/ruby/2.7.0/gems/httpclient-2.8.3/lib/httpclient
|
||||||
|
+
|
||||||
|
# Set the work dir and the container entry point
|
||||||
|
WORKDIR /opt/mastodon
|
||||||
|
ENTRYPOINT ["/usr/bin/tini", "--"]
|
||||||
|
diff --git a/Gemfile.lock b/Gemfile.lock
|
||||||
|
index a01341fc9..573c8e776 100644
|
||||||
|
--- a/Gemfile.lock
|
||||||
|
+++ b/Gemfile.lock
|
||||||
|
@@ -279,8 +279,8 @@ GEM
|
||||||
|
http-parser (1.2.1)
|
||||||
|
ffi-compiler (>= 1.0, < 2.0)
|
||||||
|
http_accept_language (2.1.1)
|
||||||
|
- httplog (1.5.0)
|
||||||
|
httpclient (2.8.3)
|
||||||
|
+ httplog (1.5.0)
|
||||||
|
rack (>= 1.0)
|
||||||
|
rainbow (>= 2.0.0)
|
||||||
|
i18n (1.8.10)
|
||||||
|
@@ -843,9 +843,3 @@ DEPENDENCIES
|
||||||
|
webpacker (~> 5.4)
|
||||||
|
webpush (~> 0.3)
|
||||||
|
xorcist (~> 1.1)
|
||||||
|
-
|
||||||
|
-RUBY VERSION
|
||||||
|
- ruby 2.6.5p114
|
||||||
|
-
|
||||||
|
-BUNDLED WITH
|
||||||
|
- 1.17.2
|
||||||
|
```
|
||||||
|
|
Loading…
Reference in New Issue