Make tini work
This commit is contained in:
parent
11b19e6bbb
commit
b4eb525f96
14
Dockerfile
14
Dockerfile
|
@ -90,9 +90,7 @@ RUN apt -y --no-install-recommends install \
|
||||||
file ca-certificates tzdata libreadline7 && \
|
file ca-certificates tzdata libreadline7 && \
|
||||||
apt -y install gcc && \
|
apt -y install gcc && \
|
||||||
ln -s /opt/mastodon /mastodon && \
|
ln -s /opt/mastodon /mastodon && \
|
||||||
gem install bundler && \
|
gem install bundler
|
||||||
rm -rf /var/cache && \
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
|
||||||
|
|
||||||
# Add tini
|
# Add tini
|
||||||
ENV TINI_VERSION="0.18.0"
|
ENV TINI_VERSION="0.18.0"
|
||||||
|
@ -102,11 +100,15 @@ ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-${TI
|
||||||
|
|
||||||
RUN apt update && \
|
RUN apt update && \
|
||||||
apt -y --no-install-recommends install gpg gpg-agent dirmngr && \
|
apt -y --no-install-recommends install gpg gpg-agent dirmngr && \
|
||||||
gpg --batch \
|
rm -rf /var/cache && \
|
||||||
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
RUN gpg --batch \
|
||||||
--keyserver hkp://p80.pool.sks-keyservers.net:80 \
|
--keyserver hkp://p80.pool.sks-keyservers.net:80 \
|
||||||
--recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
--recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
|
||||||
gpg --batch --verify /tini.asc /tini && \
|
gpg --batch --verify /tini.asc /tini
|
||||||
chmod +x /tini
|
|
||||||
|
RUN chmod +rx /tini
|
||||||
|
|
||||||
# Copy over mastodon source, and dependencies from building, and set permissions
|
# Copy over mastodon source, and dependencies from building, and set permissions
|
||||||
COPY --chown=mastodon:mastodon . /opt/mastodon
|
COPY --chown=mastodon:mastodon . /opt/mastodon
|
||||||
|
|
|
@ -16,8 +16,7 @@ require_input() {
|
||||||
|
|
||||||
require_input "$TAG" "container tag"
|
require_input "$TAG" "container tag"
|
||||||
|
|
||||||
# architectures=('amd64' 'arm32v7' 'arm64v8')
|
architectures=('arm64v8' 'arm32v7' 'amd64')
|
||||||
architectures=('arm64v8')
|
|
||||||
|
|
||||||
for architecture in "${architectures[@]}"; do
|
for architecture in "${architectures[@]}"; do
|
||||||
sed "s/FROM ubuntu/FROM $architecture\/ubuntu/g" Dockerfile > "Dockerfile-$architecture"
|
sed "s/FROM ubuntu/FROM $architecture\/ubuntu/g" Dockerfile > "Dockerfile-$architecture"
|
||||||
|
|
Loading…
Reference in a new issue