Improve CI build

Author: vtm9

.github/workflows/master.yml

@@ -91,14 +91,14 @@ jobs:
         run: yarn lint
         working-directory: ./services/app/apps/codebattle
 
-      - name: Mix audit
-        run: mix hex.audit
-        working-directory: ./services/app
-
       - name: Run jest
         run: yarn test
         working-directory: ./services/app/apps/codebattle
 
+      - name: Mix audit
+        run: mix hex.audit
+        working-directory: ./services/app
+
       - name: Setup db
         run: mix ecto.create && mix ecto.migrate
         working-directory: ./services/app

Makefile

@@ -61,27 +61,21 @@ docker-build-local:
 				--tag codebattle/runner:latest services/app
 
 docker-build-codebattle:
-	docker pull codebattle/codebattle:assets-image  || true
-	docker pull codebattle/codebattle:compile-image || true
-	docker pull codebattle/codebattle:latest        || true
+	# docker pull codebattle/codebattle:assets-image  || true
+	# docker pull codebattle/codebattle:compile-image || true
+	# docker pull codebattle/codebattle:latest        || true
 	docker build --target assets-image \
-				--cache-from=codebattle/codebattle:assets-image \
 				--file services/app/Dockerfile.codebattle \
 				--build-arg GIT_HASH=$(GIT_HASH) \
 				--tag codebattle/codebattle:assets-image services/app
 	docker build --target compile-image \
-				--cache-from=codebattle/codebattle:assets-image \
-				--cache-from=codebattle/codebattle:compile-image \
 				--file services/app/Dockerfile.codebattle \
 				--build-arg GIT_HASH=$(GIT_HASH) \
 				--tag codebattle/codebattle:compile-image services/app
 	docker build --target nginx-assets \
 				--file services/app/Dockerfile.codebattle \
 				--tag codebattle/nginx-assets:latest services/app
 	docker build --target runtime-image \
-				--cache-from=codebattle/codebattle:assets-image \
-				--cache-from=codebattle/codebattle:compile-image \
-				--cache-from=codebattle/codebattle:latest \
 				--file services/app/Dockerfile.codebattle \
 				--build-arg GIT_HASH=$(GIT_HASH) \
 				--tag codebattle/codebattle:latest services/app
@@ -93,15 +87,12 @@ docker-push-codebattle:
 	docker push codebattle/nginx-assets:latest
 
 docker-build-runner:
-	docker pull codebattle/runner:compile-image || true
-	docker pull codebattle/runner:latest        || true
+	# docker pull codebattle/runner:compile-image || true
+	# docker pull codebattle/runner:latest        || true
 	docker build --target compile-image \
-				--cache-from=codebattle/runner:compile-image \
 				--file services/app/Dockerfile.runner \
 				--tag codebattle/runner:compile-image services/app
 	docker build --target runtime-image \
-				--cache-from=codebattle/runner:compile-image \
-				--cache-from=codebattle/runner:latest \
 				--file services/app/Dockerfile.runner \
 				--tag codebattle/runner:latest services/app
 

services/app/Dockerfile.codebattle

@@ -4,15 +4,12 @@ ENV MIX_ENV=prod
 WORKDIR /tmp/codebattle/assets
 
 COPY apps/codebattle/package.json apps/codebattle/yarn.lock ./
-
 RUN yarn install --frozen-lockfile --network-timeout 300000
 
-COPY apps/codebattle/postcss.config.js \
-  apps/codebattle/.babelrc \
-  apps/codebattle/webpack \
-  apps/codebattle/assets \
-  apps/codebattle/priv/gettext \
-  ./
+COPY apps/codebattle/postcss.config.js apps/codebattle/.babelrc ./
+COPY apps/codebattle/webpack ./webpack
+COPY apps/codebattle/assets ./assets
+COPY apps/codebattle/priv/gettext ./priv/gettext
 
 RUN yarn build
 
@@ -24,11 +21,12 @@ ENV MIX_ENV=prod
 
 WORKDIR /opt/app
 
-RUN apk add --no-cache build-base \
+RUN apk add --no-cache build-base git ca-certificates \
   && mix local.hex --force \
   && mix local.rebar --force
 
-COPY mix.exs mix.lock ./
+COPY mix.exs .
+COPY mix.lock .
 COPY config ./config
 COPY apps/runner/mix.exs apps/runner/mix.exs
 COPY apps/phoenix_gon/mix.exs apps/phoenix_gon/mix.exs