From 01ed450f6e4200366b751dab803a8f451b6bb4b2 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <the@jeffreyfreeman.me>
Date: Wed, 28 Oct 2020 15:42:21 -0400
Subject: [PATCH] Updated dockerfiles for qoto-groups target.
---
Dockerfile | 19 ++++++++++++-------
docker-compose.yml | 6 +++---
2 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index fa6abad5a1..c52f89fdca 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,7 +36,8 @@ RUN apt update && \
./autogen.sh && \
./configure --prefix=/opt/jemalloc && \
make -j$(nproc) > /dev/null && \
- make install_bin install_include install_lib
+ make install_bin install_include install_lib && \
+ cd .. && rm -rf jemalloc-$JE_VER $JE_VER.tar.gz
# Install Ruby
ENV RUBY_VER="2.6.6"
@@ -56,7 +57,8 @@ RUN apt update && \
--disable-install-doc && \
ln -s /opt/jemalloc/lib/* /usr/lib/ && \
make -j$(nproc) > /dev/null && \
- make install
+ make install && \
+ cd .. && rm -rf ruby-$RUBY_VER.tar.gz ruby-$RUBY_VER
ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
@@ -107,11 +109,14 @@ RUN apt -y --no-install-recommends install \
rm -rf /var/lib/apt/lists/*
# Add tini
-ENV TINI_VERSION="0.18.0"
-ENV TINI_SUM="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
-ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
-RUN echo "$TINI_SUM tini" | sha256sum -c -
-RUN chmod +x /tini
+ENV TINI_VERSION="0.19.0"
+RUN dpkgArch="$(dpkg --print-architecture)" && \
+ ARCH=$dpkgArch && \
+ wget https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH \
+ https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH.sha256sum && \
+ cat tini-$ARCH.sha256sum | sha256sum -c - && \
+ mv tini-$ARCH /tini && rm tini-$ARCH.sha256sum && \
+ chmod +x /tini
# Copy over mastodon source, and dependencies from building, and set permissions
COPY --chown=mastodon:mastodon . /opt/mastodon
diff --git a/docker-compose.yml b/docker-compose.yml
index 52eea7a74f..0ab700d81b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
web:
build: .
- image: tootsuite/mastodon
+ image: qotoorg/qoto-groups
restart: always
env_file: .env.production
command: bash -c "rm -f /mastodon/tmp/pids/server.pid; bundle exec rails s -p 3000"
@@ -63,7 +63,7 @@ services:
streaming:
build: .
- image: tootsuite/mastodon
+ image: qotoorg/qoto-groups
restart: always
env_file: .env.production
command: node ./streaming
@@ -80,7 +80,7 @@ services:
sidekiq:
build: .
- image: tootsuite/mastodon
+ image: qotoorg/qoto-groups
restart: always
env_file: .env.production
command: bundle exec sidekiq
--
GitLab