Merge branch 'master' of git.asonix.dog:asonix/docker
This commit is contained in:
commit
a6043ca056
|
@ -24,7 +24,7 @@ RUN apk add --no-cache whois nodejs yarn ca-certificates git bash \
|
|||
ARG UID=1001
|
||||
ARG GID=1001
|
||||
RUN echo "Etc/UTC" > /etc/localtime && \
|
||||
mkdir -p /opt/mastodon && \
|
||||
mkdir -p /opt/mastodon && \
|
||||
addgroup --gid $GID mastodon && \
|
||||
adduser -D -h /opt/mastodon -u $UID -G mastodon -h /opt/mastodon mastodon && \
|
||||
echo "mastodon:`head /dev/urandom | tr -dc A-Za-z0-9 | head -c 24 | mkpasswd -s -m sha-256`" | chpasswd && \
|
||||
|
@ -38,8 +38,8 @@ RUN git clone -b ${TAG} ${GIT_REPOSITORY} /opt/mastodon && \
|
|||
# Install dependencies
|
||||
WORKDIR /opt/mastodon
|
||||
RUN mkdir -p /opt/mastodon/.config/yarn/global && \
|
||||
touch /opt/mastodon/.config/yarn/global/.yarnclean && \
|
||||
gem install bundler:1.17.2 && \
|
||||
touch /opt/mastodon/.config/yarn/global/.yarnclean && \
|
||||
gem install bundler:1.17.2 && \
|
||||
bundle config set deployment 'true' && \
|
||||
bundle install -j$(nproc) --without development test --with production && \
|
||||
yarn install --pure-lockfile
|
||||
|
|
Loading…
Reference in a new issue