From 83e40f5ede255961c9ab3ed822d3e86fd8af655c Mon Sep 17 00:00:00 2001 From: Maff Date: Mon, 9 May 2022 14:27:55 +0000 Subject: [PATCH] 3.5.2 fixes Fix some issues with the pinafore additions and docker push Add a patch to include an explicitly non-localised message on registration --- .../3.5.2_1-non-localised-reg-message.patch | 10 +++++++ libqueerpatchy.sh | 27 +++++++++++-------- 2 files changed, 26 insertions(+), 11 deletions(-) create mode 100644 deploy/3.5.2_1-non-localised-reg-message.patch diff --git a/deploy/3.5.2_1-non-localised-reg-message.patch b/deploy/3.5.2_1-non-localised-reg-message.patch new file mode 100644 index 0000000..7043970 --- /dev/null +++ b/deploy/3.5.2_1-non-localised-reg-message.patch @@ -0,0 +1,10 @@ +--- untainted/app/views/about/_registration.html.haml ++++ tainted/app/views/about/_registration.html.haml +@@ -17,6 +17,7 @@ + = f.input :website, as: :url, placeholder: t('simple_form.labels.defaults.honeypot', label: 'Website'), required: false, input_html: { 'aria-label' => t('simple_form.labels.defaults.honeypot', label: 'Website'), :autocomplete => 'off' }, hint: false, disabled: disabled + + - if approved_registrations? ++ %p!= "Please complete in plain English, and please write a full sentence explaining why you'd like to sign up. A real person is reviewing sign-ups, to prevent spam and abuse." + .fields-group + = f.simple_fields_for :invite_request do |invite_request_fields| + = invite_request_fields.input :text, as: :text, wrapper: :with_block_label, required: Setting.require_invite_text diff --git a/libqueerpatchy.sh b/libqueerpatchy.sh index a2022b1..2912609 100755 --- a/libqueerpatchy.sh +++ b/libqueerpatchy.sh @@ -75,14 +75,19 @@ build_pinafore() { docker build -t maffsie/qp-pinafore:latest -t maffsie/qp-pinafore:v$PINAFORE_VERSION pinafore/ } push_image() { - docker push maffsie/qp-mastodon - docker push maffsie/qp-pinafore + docker push -a maffsie/qp-mastodon +} +push_pinafore() { + docker push -a maffsie/qp-pinafore } cleanup_prebuild() { rm -rf untainted tainted modifications } cleanup_postbuild() { - rm -rf deploy/queer.party.patch deploy/fonts deploy/images deploy/loader pinafore + rm -rf deploy/queer.party.patch deploy/fonts deploy/images deploy/loader +} +cleanup_pinafore() { + rm -rf pinafore } cleanup_docker() { docker image prune -af @@ -106,14 +111,17 @@ build() { push() { case "$1" in image) push_image;; + pinafore) push_pinafore;; + all) push_image; push_pinafore;; esac } cleanup() { case "$1" in prebuild) cleanup_prebuild;; postbuild) cleanup_postbuild;; + pinafore) cleanup_pinafore;; docker) cleanup_docker;; - all) cleanup_prebuild; cleanup_postbuild; cleanup_docker;; + all) cleanup_prebuild; cleanup_postbuild; cleanup_pinafore; cleanup_docker;; esac } main() { @@ -132,11 +140,9 @@ main() { build image if [ "x$PINAFORE_VERSION" != "x" ]; then pinafore_main - else - push image - cleanup postbuild - cleanup docker fi + push image + cleanup postbuild } pinafore_main() { if [ "x$PINAFORE_VERSION" == "x" ]; then @@ -145,8 +151,7 @@ pinafore_main() { fi prep pinafore build pinafore - push image - cleanup postbuild - cleanup docker + push pinafore + cleanup pinafore }