Merge branch 'revert-f30d74f2' into 'master'
Revert "Merge branch 'setop-patch-dockerbuild' into 'master'" See merge request framasoft/mobilizon!999
This commit is contained in:
commit
7eaf98b5b2
|
@ -1,13 +1,11 @@
|
||||||
# syntax=docker/dockerfile:1.2
|
|
||||||
|
|
||||||
# First build the application assets
|
# First build the application assets
|
||||||
FROM node:16-alpine as assets
|
FROM node:16-alpine as assets
|
||||||
|
|
||||||
RUN apk add --no-cache python3 build-base libwebp-tools bash imagemagick ncurses
|
RUN apk add --no-cache python3 build-base libwebp-tools bash imagemagick ncurses
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
COPY js .
|
COPY js .
|
||||||
RUN --mount=type=cache,target=/root/.cache yarn install
|
RUN yarn install \
|
||||||
RUN yarn run build
|
&& yarn run build
|
||||||
|
|
||||||
# Then, build the application binary
|
# Then, build the application binary
|
||||||
FROM elixir:1.12-alpine AS builder
|
FROM elixir:1.12-alpine AS builder
|
||||||
|
@ -26,9 +24,6 @@ COPY config/config.exs config/prod.exs ./config/
|
||||||
COPY config/docker.exs ./config/runtime.exs
|
COPY config/docker.exs ./config/runtime.exs
|
||||||
COPY rel ./rel
|
COPY rel ./rel
|
||||||
COPY support ./support
|
COPY support ./support
|
||||||
|
|
||||||
RUN mix compile
|
|
||||||
|
|
||||||
COPY --from=assets ./priv/static ./priv/static
|
COPY --from=assets ./priv/static ./priv/static
|
||||||
|
|
||||||
RUN mix phx.digest \
|
RUN mix phx.digest \
|
||||||
|
|
Loading…
Reference in a new issue