Compare commits
5 Commits
812314f4a8
...
78ca49ef0e
| Author | SHA1 | Date | |
|---|---|---|---|
|
78ca49ef0e
|
|||
|
e84feb0121
|
|||
|
f55f48f6ef
|
|||
| 7a016b4afa | |||
| 366937e335 |
@@ -877,3 +877,11 @@
|
||||
* Fix type of `interactingObject`, `interactionTarget` and add missing `QuoteAuthorization` ([#38940](https://github.com/tootsuite/mastodon/issues/38940) by [@ClearlyClaire](https://github.com/ClearlyClaire))
|
||||
* Remove unused devise strategies ([#38795](https://github.com/tootsuite/mastodon/issues/38795) by [@ClearlyClaire](https://github.com/ClearlyClaire))
|
||||
|
||||
[1.17.12]
|
||||
* Update mastodon to 4.5.11
|
||||
* [Full Changelog](https://github.com/mastodon/mastodon/releases/tag/v4.5.11)
|
||||
* Fix allowed attribution domains spoofing ([GHSA-rwcw-vq68-g34p](https://github.com/mastodon/mastodon/security/advisories/GHSA-rwcw-vq68-g34p))
|
||||
* Fix uncaught exception in message sanitization causing Denial of Service ([GHSA-qrgq-9fx2-vf2r](https://github.com/mastodon/mastodon/security/advisories/GHSA-qrgq-9fx2-vf2r))
|
||||
* Update dependencies
|
||||
* Fix remote statuses with large media descriptions being rejected ([#39135](https://github.com/tootsuite/mastodon/issues/39135) by [@ClearlyClaire](https://github.com/ClearlyClaire))
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@
|
||||
"description": "file://DESCRIPTION.md",
|
||||
"changelog": "file://CHANGELOG",
|
||||
"tagline": "Federated social network",
|
||||
"version": "1.17.11",
|
||||
"upstreamVersion": "4.5.10",
|
||||
"version": "1.17.12",
|
||||
"upstreamVersion": "4.5.11",
|
||||
"healthCheckPath": "/about",
|
||||
"httpPort": 8000,
|
||||
"memoryLimit": 1610612736,
|
||||
|
||||
+10
-4
@@ -68,7 +68,7 @@ RUN mkdir -p /app/code /app/pkg
|
||||
WORKDIR /app/code
|
||||
|
||||
# renovate: datasource=github-releases depName=tootsuite/mastodon versioning=semver extractVersion=^v(?<version>.+)$
|
||||
ARG MASTODON_VERSION=4.5.10
|
||||
ARG MASTODON_VERSION=4.5.11
|
||||
|
||||
ENV RAILS_ENV production
|
||||
ENV NODE_ENV production
|
||||
@@ -90,8 +90,14 @@ RUN ldconfig && \
|
||||
ffmpeg -version && \
|
||||
ffprobe -version
|
||||
|
||||
RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.tar.gz | tar -xz --strip-components 1 -f - && \
|
||||
bundle config --local set deployment 'true' && \
|
||||
# Download Mastodon source
|
||||
RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.tar.gz | tar -xz --strip-components 1 -f -
|
||||
|
||||
RUN sed -i 's/MAX_CHARS = 500/MAX_CHARS = 2500/g' app/validators/status_length_validator.rb && \
|
||||
sed -i "s/max_characters'], 500)/max_characters'], 2500)/g" app/javascript/mastodon/features/compose/containers/compose_form_container.js
|
||||
|
||||
# Install Ruby dependencies
|
||||
RUN bundle config --local set deployment 'true' && \
|
||||
bundle config --local set without 'development test' && \
|
||||
bundle config --local set silence_root_warning true && \
|
||||
bundle install && \
|
||||
@@ -100,7 +106,6 @@ RUN curl -L https://github.com/tootsuite/mastodon/archive/v${MASTODON_VERSION}.t
|
||||
|
||||
RUN corepack enable && \
|
||||
corepack prepare --activate
|
||||
|
||||
RUN yarn workspaces focus --production @mastodon/mastodon
|
||||
RUN yarn install
|
||||
|
||||
@@ -134,3 +139,4 @@ RUN ln -fs /app/data/system /app/code/public/system
|
||||
COPY start.sh cleanup.sh config.sh env.template cache-env.sh.template /app/pkg/
|
||||
|
||||
CMD [ "/app/pkg/start.sh" ]
|
||||
|
||||
|
||||
Reference in New Issue
Block a user