mastodon: update to 1.5.0

mastodon/Dockerfile.rc.targaryen

@@ -1,79 +0,0 @@
-FROM alpine:3.6
-
-ARG VERSION=v1.5.0rc2
-ARG REPOSITORY=tootsuite/mastodon
-
-ENV UID=991 GID=991 \
-    RUN_DB_MIGRATIONS=true \
-    SIDEKIQ_WORKERS=5 \
-    RAILS_SERVE_STATIC_FILES=true \
-    RAILS_ENV=production \
-    NODE_ENV=production \
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/mastodon/bin
-
-WORKDIR /mastodon
-
-COPY targaryen-rc /tmp/targaryen
-
-RUN apk -U upgrade \
- && apk add \
-    ca-certificates \
-    ffmpeg \
-    file \
-    git \
-    icu-libs \
-    imagemagick \
-    libidn \
-    libpq \
-    libressl \
-    libxml2 \
-    libxslt \
-    nodejs-current-npm \
-    nodejs-current \
-    protobuf \
-    ruby \
-    ruby-bigdecimal \
-    ruby-io-console \
-    ruby-irb \
-    ruby-json \
-    s6 \
-    su-exec \
- && apk add -t build-dependencies \
-    build-base \
-    icu-dev \
-    libffi-dev \
-    libidn-dev \
-    libxml2-dev \
-    libxslt-dev \
-    postgresql-dev \
-    protobuf-dev \
-    python \
-    ruby-dev \
-    ruby-rdoc \
-    tar \
- && update-ca-certificates \
- && wget -qO- https://github.com/${REPOSITORY}/archive/${VERSION}.tar.gz | tar xz --strip 1 \
- && cp -R /tmp/targaryen/* . && chmod +x targaryen.sh && ./targaryen.sh \
- && gem install bundler \
- && bundle install --deployment --clean --no-cache --without test development \
- && npm install -g npm@3 && npm install -g yarn \
- && yarn --ignore-optional --pure-lockfile \
- && SECRET_KEY_BASE=$(rake secret) SMTP_FROM_ADDRESS= rake assets:precompile \
- && npm -g cache clean && yarn cache clean \
- && mv public/assets /tmp/assets && mv public/packs /tmp/packs \
- && apk del build-dependencies \
- && rm -rf /var/cache/apk/*
-
-COPY rootfs /
-
-RUN chmod +x /usr/local/bin/* /etc/s6.d/*/* /etc/s6.d/.s6-svscan/*
-
-VOLUME /mastodon/public/system /mastodon/public/assets /mastodon/public/packs /mastodon/log
-
-EXPOSE 3000 4000
-
-LABEL maintainer="Wonderfall <wonderfall@targaryen.house>" \
-      description="A GNU Social-compatible microblogging server"
-
-ENTRYPOINT ["/usr/local/bin/run"]
-CMD ["/bin/s6-svscan", "/etc/s6.d"]

mastodon/Dockerfile.stable

@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG VERSION=v1.4.7
+ARG VERSION=v1.5.0
 ARG REPOSITORY=tootsuite/mastodon
 
 ENV UID=991 GID=991 \
@@ -19,7 +19,9 @@ RUN apk -U upgrade \
     ffmpeg \
     file \
     git \
+    icu-libs \
     imagemagick \
+    libidn \
     libpq \
     libressl \
     libxml2 \
@@ -36,7 +38,9 @@ RUN apk -U upgrade \
     su-exec \
  && apk add -t build-dependencies \
     build-base \
+    icu-dev \
     libffi-dev \
+    libidn-dev \
     libxml2-dev \
     libxslt-dev \
     postgresql-dev \
@@ -51,7 +55,7 @@ RUN apk -U upgrade \
  && bundle install --deployment --clean --no-cache --without test development \
  && npm install -g npm@3 && npm install -g yarn \
  && yarn --ignore-optional --pure-lockfile \
- && SECRET_KEY_BASE=$(rake secret) rake assets:precompile \
+ && SECRET_KEY_BASE=$(rake secret) SMTP_FROM_ADDRESS= rake assets:precompile \
  && npm -g cache clean && yarn cache clean \
  && mv public/assets /tmp/assets && mv public/packs /tmp/packs \
  && apk del build-dependencies \

mastodon/Dockerfile.targaryen

@@ -1,6 +1,6 @@
 FROM alpine:3.6
 
-ARG VERSION=v1.4.7
+ARG VERSION=v1.5.0
 ARG REPOSITORY=tootsuite/mastodon
 
 ENV UID=991 GID=991 \
@@ -21,7 +21,9 @@ RUN apk -U upgrade \
     ffmpeg \
     file \
     git \
+    icu-libs \
     imagemagick \
+    libidn \
     libpq \
     libressl \
     libxml2 \
@@ -38,7 +40,9 @@ RUN apk -U upgrade \
     su-exec \
  && apk add -t build-dependencies \
     build-base \
+    icu-dev \
     libffi-dev \
+    libidn-dev \
     libxml2-dev \
     libxslt-dev \
     postgresql-dev \
@@ -54,7 +58,7 @@ RUN apk -U upgrade \
  && bundle install --deployment --clean --no-cache --without test development \
  && npm install -g npm@3 && npm install -g yarn \
  && yarn --ignore-optional --pure-lockfile \
- && SECRET_KEY_BASE=$(rake secret) rake assets:precompile \
+ && SECRET_KEY_BASE=$(rake secret) SMTP_FROM_ADDRESS= rake assets:precompile \
  && npm -g cache clean && yarn cache clean \
  && mv public/assets /tmp/assets && mv public/packs /tmp/packs \
  && apk del build-dependencies \

mastodon/targaryen-rc/app/javascript/styles/variables.scss

@@ -1,29 +0,0 @@
-// Commonly used web colors
-$black: #000000;            // Black
-$white: #ffffff;            // White
-$success-green: #79bd9a;    // Padua
-$error-red: #df405a;        // Cerise
-$warning-red: #ff5050;      // Sunset Orange
-$gold-star: #ca8f04;        // Dark Goldenrod
-
-// Values from the classic Mastodon UI
-$classic-base-color: #282828;         // Midnight Grey
-$classic-primary-color: #c89b9b;      // Echo Red
-$classic-secondary-color: #e8d9d9;    // Pattens Red
-$classic-highlight-color: #d92b2b;    // Summer RedSky
-
-// Variables for defaults in UI
-$base-shadow-color: $black !default;
-$base-overlay-background: $black !default;
-$base-border-color: $white !default;
-$simple-background-color: $white !default;
-$primary-text-color: $white !default;
-$valid-value-color: $success-green !default;
-$error-value-color: $error-red !default;
-
-// Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default;                  // Darkest
-$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest
-$ui-primary-color: $classic-primary-color !default;            // Lighter
-$ui-secondary-color: $classic-secondary-color !default;        // Lightest
-$ui-highlight-color: $classic-highlight-color !default;        // Vibrant

mastodon/targaryen-rc/targaryen.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-### Increase number of characters / toot
-sed -i -e 's/500/800/g' \
-    app/javascript/mastodon/features/compose/components/compose_form.js \
-    app/validators/status_length_validator.rb \
-    storybook/stories/character_counter.story.js \
-    config/locales/*.yml
-
-### Increase bio length
-sed -i -e 's/160/400/g' \
-    app/javascript/packs/public.js \
-    app/models/account.rb \
-    app/views/settings/profiles/show.html.haml
-
-### Dragon emoji
-sed -i -e 's/1f602/1f432/g' \
-    app/javascript/mastodon/features/compose/components/emoji_picker_dropdown.js

mastodon/targaryen/app/javascript/styles/variables.scss

@@ -22,7 +22,8 @@ $valid-value-color: $success-green !default;
 $error-value-color: $error-red !default;
 
 // Tell UI to use selected colors
-$ui-base-color: $classic-base-color !default;             // Darkest
+$ui-base-color: $classic-base-color !default;                  // Darkest
-$ui-primary-color: $classic-primary-color !default;       // Lighter
+$ui-base-lighter-color: lighten($ui-base-color, 26%) !default; // Lighter darkest
-$ui-secondary-color: $classic-secondary-color !default;   // Lightest
+$ui-primary-color: $classic-primary-color !default;            // Lighter
-$ui-highlight-color: $classic-highlight-color !default;   // Vibrant
+$ui-secondary-color: $classic-secondary-color !default;        // Lightest
+$ui-highlight-color: $classic-highlight-color !default;        // Vibrant