lol, broke the build
parent
e52819c2fb
commit
ad81a51e37
|
@ -8,7 +8,8 @@ FROM node:${NODE_VERSION} as build
|
||||||
COPY --link --from=ruby /opt/ruby /opt/ruby
|
COPY --link --from=ruby /opt/ruby /opt/ruby
|
||||||
|
|
||||||
ENV DEBIAN_FRONTEND="noninteractive" \
|
ENV DEBIAN_FRONTEND="noninteractive" \
|
||||||
PATH="${PATH}:/opt/ruby/bin"
|
PATH="${PATH}:/opt/ruby/bin" \
|
||||||
|
NODE_OPTIONS=--openssl-legacy-provider
|
||||||
|
|
||||||
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
||||||
|
|
||||||
|
@ -50,11 +51,12 @@ ENV RAILS_ENV="production" \
|
||||||
# Precompile assets
|
# Precompile assets
|
||||||
# TODO(kouhai): we're currently patching node_modules because of emoji-mart.
|
# TODO(kouhai): we're currently patching node_modules because of emoji-mart.
|
||||||
# we should integrate our own fork instead.
|
# we should integrate our own fork instead.
|
||||||
COPY ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json
|
COPY --link . /opt/mastodon
|
||||||
ENV OTP_SECRET=precompile_placeholder \
|
ENV OTP_SECRET=precompile_placeholder \
|
||||||
SECRET_KEY_BASE=precompile_placeholder \
|
SECRET_KEY_BASE=precompile_placeholder \
|
||||||
RAKE_NO_YARN_INSTALL_HACK=1
|
RAKE_NO_YARN_INSTALL_HACK=1
|
||||||
RUN bundle exec rails assets:precompile
|
RUN mv ./emoji_data/all.json ./node_modules/emoji-mart/data/all.json && \
|
||||||
|
bundle exec rails assets:precompile
|
||||||
|
|
||||||
|
|
||||||
FROM node:${NODE_VERSION}
|
FROM node:${NODE_VERSION}
|
||||||
|
@ -97,7 +99,6 @@ RUN apt-get update && \
|
||||||
# Note: no, cleaning here since Debian does this automatically
|
# Note: no, cleaning here since Debian does this automatically
|
||||||
# See the file /etc/apt/apt.conf.d/docker-clean within the Docker image's filesystem
|
# See the file /etc/apt/apt.conf.d/docker-clean within the Docker image's filesystem
|
||||||
|
|
||||||
COPY --link --chown=mastodon:mastodon . /opt/mastodon
|
|
||||||
COPY --link --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon
|
COPY --link --chown=mastodon:mastodon --from=build /opt/mastodon /opt/mastodon
|
||||||
|
|
||||||
ENV RAILS_ENV="production" \
|
ENV RAILS_ENV="production" \
|
||||||
|
|
Loading…
Reference in New Issue