diff --git a/mastodon/Dockerfile.rc.targaryen b/mastodon/Dockerfile.rc.targaryen deleted file mode 100644 index 7b6a6c2..0000000 --- a/mastodon/Dockerfile.rc.targaryen +++ /dev/null @@ -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 " \ - description="A GNU Social-compatible microblogging server" - -ENTRYPOINT ["/usr/local/bin/run"] -CMD ["/bin/s6-svscan", "/etc/s6.d"] diff --git a/mastodon/Dockerfile.stable b/mastodon/Dockerfile.stable index 419f7c8..f42d0ac 100644 --- a/mastodon/Dockerfile.stable +++ b/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 \ diff --git a/mastodon/Dockerfile.targaryen b/mastodon/Dockerfile.targaryen index 21e6e0c..793a711 100644 --- a/mastodon/Dockerfile.targaryen +++ b/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 \ diff --git a/mastodon/targaryen-rc/app/javascript/images/elephant-friend.png b/mastodon/targaryen-rc/app/javascript/images/elephant-friend.png deleted file mode 100644 index cb5599c..0000000 Binary files a/mastodon/targaryen-rc/app/javascript/images/elephant-friend.png and /dev/null differ diff --git a/mastodon/targaryen-rc/app/javascript/images/logo.svg b/mastodon/targaryen-rc/app/javascript/images/logo.svg deleted file mode 100644 index 8e55946..0000000 --- a/mastodon/targaryen-rc/app/javascript/images/logo.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/mastodon/targaryen-rc/app/javascript/images/mastodon-getting-started.png b/mastodon/targaryen-rc/app/javascript/images/mastodon-getting-started.png deleted file mode 100644 index 80e4aca..0000000 Binary files a/mastodon/targaryen-rc/app/javascript/images/mastodon-getting-started.png and /dev/null differ diff --git a/mastodon/targaryen-rc/app/javascript/images/mastodon-not-found.png b/mastodon/targaryen-rc/app/javascript/images/mastodon-not-found.png deleted file mode 100644 index a688bca..0000000 Binary files a/mastodon/targaryen-rc/app/javascript/images/mastodon-not-found.png and /dev/null differ diff --git a/mastodon/targaryen-rc/app/javascript/styles/variables.scss b/mastodon/targaryen-rc/app/javascript/styles/variables.scss deleted file mode 100644 index c89f27d..0000000 --- a/mastodon/targaryen-rc/app/javascript/styles/variables.scss +++ /dev/null @@ -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 diff --git a/mastodon/targaryen-rc/public/android-chrome-192x192.png b/mastodon/targaryen-rc/public/android-chrome-192x192.png deleted file mode 100644 index f1a0833..0000000 Binary files a/mastodon/targaryen-rc/public/android-chrome-192x192.png and /dev/null differ diff --git a/mastodon/targaryen-rc/public/apple-touch-icon.png b/mastodon/targaryen-rc/public/apple-touch-icon.png deleted file mode 100644 index 3f38fcf..0000000 Binary files a/mastodon/targaryen-rc/public/apple-touch-icon.png and /dev/null differ diff --git a/mastodon/targaryen-rc/public/avatars/original/missing.png b/mastodon/targaryen-rc/public/avatars/original/missing.png deleted file mode 100644 index 6348b08..0000000 Binary files a/mastodon/targaryen-rc/public/avatars/original/missing.png and /dev/null differ diff --git a/mastodon/targaryen-rc/public/favicon.ico b/mastodon/targaryen-rc/public/favicon.ico deleted file mode 100644 index 6b25ef6..0000000 Binary files a/mastodon/targaryen-rc/public/favicon.ico and /dev/null differ diff --git a/mastodon/targaryen-rc/public/mstile-150x150.png b/mastodon/targaryen-rc/public/mstile-150x150.png deleted file mode 100644 index e596c6c..0000000 Binary files a/mastodon/targaryen-rc/public/mstile-150x150.png and /dev/null differ diff --git a/mastodon/targaryen-rc/public/oops.png b/mastodon/targaryen-rc/public/oops.png deleted file mode 100644 index 24a45a0..0000000 Binary files a/mastodon/targaryen-rc/public/oops.png and /dev/null differ diff --git a/mastodon/targaryen-rc/targaryen.sh b/mastodon/targaryen-rc/targaryen.sh deleted file mode 100644 index f2a877a..0000000 --- a/mastodon/targaryen-rc/targaryen.sh +++ /dev/null @@ -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 diff --git a/mastodon/targaryen/app/javascript/images/background-photo.jpg b/mastodon/targaryen/app/javascript/images/background-photo.jpg deleted file mode 100644 index 438b110..0000000 Binary files a/mastodon/targaryen/app/javascript/images/background-photo.jpg and /dev/null differ diff --git a/mastodon/targaryen/app/javascript/images/fluffy-elephant-friend.png b/mastodon/targaryen/app/javascript/images/fluffy-elephant-friend.png deleted file mode 100644 index c17f2e8..0000000 Binary files a/mastodon/targaryen/app/javascript/images/fluffy-elephant-friend.png and /dev/null differ diff --git a/mastodon/targaryen/app/javascript/images/logo.png b/mastodon/targaryen/app/javascript/images/logo.png deleted file mode 100644 index 951737f..0000000 Binary files a/mastodon/targaryen/app/javascript/images/logo.png and /dev/null differ diff --git a/mastodon/targaryen-rc/app/javascript/images/logo_alt.svg b/mastodon/targaryen/app/javascript/images/logo_alt.svg similarity index 100% rename from mastodon/targaryen-rc/app/javascript/images/logo_alt.svg rename to mastodon/targaryen/app/javascript/images/logo_alt.svg diff --git a/mastodon/targaryen-rc/app/javascript/images/logo_full.svg b/mastodon/targaryen/app/javascript/images/logo_full.svg similarity index 100% rename from mastodon/targaryen-rc/app/javascript/images/logo_full.svg rename to mastodon/targaryen/app/javascript/images/logo_full.svg diff --git a/mastodon/targaryen/app/javascript/styles/variables.scss b/mastodon/targaryen/app/javascript/styles/variables.scss index c904921..c89f27d 100644 --- a/mastodon/targaryen/app/javascript/styles/variables.scss +++ b/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-primary-color: $classic-primary-color !default; // Lighter -$ui-secondary-color: $classic-secondary-color !default; // Lightest -$ui-highlight-color: $classic-highlight-color !default; // Vibrant +$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