Преглед на файлове

Update build stage with latest changes

theenglishway (time) преди 4 години
родител
ревизия
57f83ac2fa
променени са 4 файла, в които са добавени 11 реда и са изтрити 9 реда
  1. 9 6
      priv/build/build.sh
  2. 0 1
      priv/build/cross_build.sh
  3. 1 1
      priv/build/debian_10/Dockerfile
  4. 1 1
      priv/build/setup-git-hooks.sh

+ 9 - 6
priv/build/build.sh

@@ -7,14 +7,17 @@ MIX_ENV=${MIX_ENV-prod}
 
 export MIX_ENV=$MIX_ENV
 
+# Clean project and get dependencies
+mix do local.rebar --force, \
+       local.hex --force, \
+       clean --only $MIX_ENV, \
+       deps.get --only $MIX_ENV
+
 # Build static assets
 npm --prefix ./assets ci --progress=false --no-audit --loglevel=error
 npm run --prefix ./assets deploy
 
-# Run an explicit clean beforehand
-mix do local.hex --force, \
-       clean --only $MIX_ENV, \
-       deps.get --only $MIX_ENV, \
+# Run project compilation
+mix do phx.digest, \
        compile --force, \
-       release --overwrite, \
-       phx.digest
+       release --overwrite

+ 0 - 1
priv/build/cross_build.sh

@@ -14,7 +14,6 @@ DOCKER_DIR=$BUILD_DIR/$OS_VERSION
 DOCKER_IMAGE_VERSION=`echo $APP_VERSION | sed "s#+#-#"`
 DOCKER_IMAGE_TAG=$APP_NAME-$OS_VERSION:$DOCKER_IMAGE_VERSION
 
-
 build_image() {
   docker build -t $DOCKER_IMAGE_TAG $DOCKER_DIR
 }

+ 1 - 1
priv/build/debian_10/Dockerfile

@@ -18,7 +18,7 @@ RUN \
   dpkg -i erlang-solutions_2.0_all.deb && \
   rm erlang-solutions_2.0_all.deb && \
   apt-get update -y && \
-  apt-get install -y elixir
+  apt-get install -y esl-erlang elixir
 
 RUN apt-get install -y curl build-essential && \
     curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \

+ 1 - 1
priv/build/setup-git-hooks.sh

@@ -2,7 +2,7 @@
 # Install git hooks
 
 CHECK_FORMAT="mix format --check-formatted"
-WRITE_VERSION="git describe --always --tags --match "v*" | sed 's/^v//' | sed 's/-/+/2' > VERSION"
+WRITE_VERSION="git describe --tags --match "v*" | sed 's/^v//' | sed 's/-/+/2' > VERSION"
 
 cat <<EOF > .git/hooks/pre-commit
 #!/bin/sh