diff --git a/CHANGELOG b/CHANGELOG index fbf55a6..b52e2e9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -97,3 +97,8 @@ [1.6.0] * Update base image to v3 +[1.6.1] +* Update Mastodon to 3.4.0 +* Add follow recommendations for onboarding +* Update dependencies + diff --git a/CloudronManifest.json b/CloudronManifest.json index 42fafae..e7eb649 100644 --- a/CloudronManifest.json +++ b/CloudronManifest.json @@ -5,7 +5,7 @@ "description": "file://DESCRIPTION.md", "changelog": "file://CHANGELOG", "tagline": "Federated social network", - "version": "1.6.0", + "version": "1.6.1", "healthCheckPath": "/about", "httpPort": 8000, "memoryLimit": 1610612736, diff --git a/DESCRIPTION.md b/DESCRIPTION.md index c86daed..c3afa8a 100644 --- a/DESCRIPTION.md +++ b/DESCRIPTION.md @@ -1,4 +1,4 @@ -This app packages Mastodon 3.3.0. +This app packages Mastodon 3.4.0. Your self-hosted, globally interconnected microblogging community. diff --git a/Dockerfile b/Dockerfile index 4edf3fb..5327702 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,8 +3,6 @@ FROM cloudron/base:3.0.0@sha256:455c70428723e3a823198c57472785437eb6eab082e79b3f RUN mkdir -p /app/code /app/pkg WORKDIR /app/code -ARG VERSION=3.3.0 - RUN apt-get update && \ apt install -y imagemagick ffmpeg libpq-dev libxml2-dev libxslt1-dev file git-core \ g++ libprotobuf-dev protobuf-compiler pkg-config nodejs gcc autoconf \ @@ -18,6 +16,9 @@ RUN gem install --no-document bundler ENV RAILS_ENV production ENV NODE_ENV production + +ARG VERSION=3.4.0 + RUN curl -L https://github.com/tootsuite/mastodon/archive/v${VERSION}.tar.gz | tar -xz --strip-components 1 -f - && \ bundle config set deployment 'true' && \ bundle install --without test development && \