Browse Source

updates to 3.2.0 allowing removal of backported patches

master
root 2 months ago
parent
commit
5436de6533
5 changed files with 5 additions and 4 deletions
  1. +0
    -0
      deploy/3.1.5_2-backport-upgrade-cli-from-master.patch.old
  2. +0
    -0
      deploy/3.1.5_3-backport-content-security-policy-nonce.patch.old
  3. +0
    -0
      deploy/3.1.5_4-backport-timeline-scroll-fix.patch.old
  4. +2
    -2
      deploy/Dockerfile
  5. +3
    -2
      libqueerpatchy.sh

deploy/3.1.5_2-backport-upgrade-cli-from-master.patch → deploy/3.1.5_2-backport-upgrade-cli-from-master.patch.old View File


deploy/3.1.5_3-backport-content-security-policy-nonce.patch → deploy/3.1.5_3-backport-content-security-policy-nonce.patch.old View File


deploy/3.1.5_4-backport-timeline-scroll-fix.patch → deploy/3.1.5_4-backport-timeline-scroll-fix.patch.old View File


+ 2
- 2
deploy/Dockerfile View File

@ -1,8 +1,8 @@
# TODO - separate build step from final step
ARG MASTODON_VERSION
FROM tootsuite/mastodon:v$MASTODON_VERSION
FROM tootsuite/mastodon:$MASTODON_VERSION
ENV QP_MASTODON_VERSION $MASTODON_VERSION
ENV QP_MASTODON_VERSION class="o">=$MASTODON_VERSION
USER root
#Seems like in v2.8.0 the official docker image no longer includes `patch`.

+ 3
- 2
libqueerpatchy.sh View File

@ -5,6 +5,7 @@ if [ "x$MASTODON_VERSION" = "x" ]; then
exit 1
fi
if [ "x$TAG_VERSION" = "x" ]; then TAG_VERSION=$MASTODON_VERSION; fi
if [ "x$DOCKER_UPSTREAM_VERSION" = "x" ]; then DOCKER_UPSTREAM_VERSION="v$MASTODON_VERSION"; fi
GIT_ARG_DEFAULTS="--recursive --jobs 4 --depth 1 --shallow-submodules --single-branch"
prep_untainted() {
git clone $GIT_ARG_DEFAULTS --branch v$MASTODON_VERSION https://git.maff.scot/mirrors/mastodon untainted
@ -60,10 +61,10 @@ build_patch() {
diff -ruN untainted tainted > deploy/queer.party.patch
}
build_image() {
docker build --build-arg MASTODON_VERSION=$MASTODON_VERSION -t maffsie/qp-mastodon:latest -t maffsie/qp-mastodon:v$TAG_VERSION deploy/
docker build --build-arg MASTODON_VERSION=$DOCKER_UPSTREAM_VERSION -t maffsie/qp-mastodon:latest -t maffsie/qp-mastodon:v$TAG_VERSION deploy/
}
push_image() {
docker push maffsie/qp-mastodon:v$TAG_VERSION;docker push maffsie/qp-mastodon:latest
docker push maffsie/qp-mastodon
}
cleanup_prebuild() {
rm -rf untainted tainted modifications

Loading…
Cancel
Save