This commit is contained in:
Mayel de Borniol 2022-12-09 14:49:21 +13:00
parent 40ffe51ab5
commit 9cf4adf37f
2 changed files with 6 additions and 6 deletions

View file

@ -38,7 +38,7 @@ RUN apk add make gcc libc-dev
# Cache elixir deps
COPY mix.exs mix.lock ./
COPY lib/mix/mess ./lib/mix/mess
COPY lib/mix ./lib/mix
# sometimes mix tries to read the config
RUN mkdir -p ./config
COPY data/current_flavour/config/config_basics.exs ./config/config.exs
@ -107,8 +107,8 @@ COPY docs/*.md ./docs/
RUN mkdir -p apps/
RUN mkdir -p forks/
RUN mkdir -p priv/static/
COPY priv/extras/ priv/extras/
RUN tar --exclude=*.env --exclude=.git --exclude=assets/node_modules --exclude=assets/static/data -czvf priv/static/source.tar.gz lib deps apps forks assets config docs priv/repo priv/extras mix.exs mix.lock LICENSE
# COPY priv/extras/ priv/extras/
RUN tar --exclude=*.env --exclude=.git --exclude=node_modules --exclude=assets/static/data -czvf priv/static/source.tar.gz lib deps apps extensions forks assets config docs priv/repo mix.exs mix.lock LICENSE
# prepare static assets
COPY data/current_flavour/config/deps_hooks.js data/current_flavour/config/deps_hooks.js

View file

@ -487,16 +487,16 @@ rel-build-release: rel-init rel-prepare assets-prepare
# Build the Docker image (including changes to local forks, and using caching)
rel-build FORKS_TO_COPY_PATH="" ARGS="":
@rel-build-path {{ if FORKS_TO_COPY_PATH != "" {FORKS_TO_COPY_PATH} else {FORKS_PATH} }} ARGS
@just rel-build-path {{ if FORKS_TO_COPY_PATH != "" {FORKS_TO_COPY_PATH} else {FORKS_PATH} }} {{ ARGS }}
rel-build-path FORKS_TO_COPY_PATH ARGS="": rel-init rel-prepare assets-prepare
@echo "Building $APP_NAME with flavour $FLAVOUR for arch {{arch()}}."
@docker build $ARGS --progress=plain \
@docker build {{ ARGS }} --progress=plain \
--build-arg FLAVOUR_PATH=data/current_flavour \
--build-arg APP_NAME=$APP_NAME \
--build-arg APP_VSN=$APP_VSN \
--build-arg APP_BUILD=$APP_BUILD \
--build-arg FORKS_TO_COPY_PATH=$FORKS_TO_COPY_PATH \
--build-arg FORKS_TO_COPY_PATH={{ FORKS_TO_COPY_PATH }} \
-t $APP_DOCKER_REPO:release-$FLAVOUR-$APP_VSN-$APP_BUILD \
-f $APP_REL_DOCKERFILE .
@echo Build complete: $APP_DOCKER_REPO:release-$FLAVOUR-$APP_VSN-$APP_BUILD