Merge pull request #193 from giusdp/main

Refactor release build and merge dockerfiles

Author: giusdp

.github/workflows/image-release.yml

@@ -51,16 +51,18 @@ jobs:
         uses: docker/[email protected]
         with:
           context: .
-          file: Dockerfile.core
+          file: Dockerfile
           push: true
           tags: ghcr.io/funlessdev/core:latest,ghcr.io/funlessdev/core:${{ env.VERSION }}
           platforms: linux/amd64
+          build-args: COMPONENT=core,MIX_ENV=prod
 
       - name: Build and push Worker
         uses: docker/[email protected]
         with:
           context: .
-          file: Dockerfile.worker
+          file: Dockerfile
           push: true
           tags: ghcr.io/funlessdev/worker:latest,ghcr.io/funlessdev/worker:${{ env.VERSION }}
           platforms: linux/amd64
+          build-args: COMPONENT=worker,MIX_ENV=prod

Dockerfile.core renamed to Dockerfile

@@ -16,10 +16,13 @@
 # This should match the version of Alpine that the `elixir:1.14-alpine` image uses
 ARG ALPINE_VERSION=3.17
 ARG SECRET_KEY_BASE
+ARG COMPONENT=core
+ARG MIX_ENV=prod
 
 FROM elixir:1.14-alpine AS builder
 
-ARG MIX_ENV=prod
+ARG MIX_ENV
+ARG COMPONENT
 
 ENV MIX_ENV=${MIX_ENV} \
     SECRET_KEY_BASE=${SECRET_KEY_BASE}
@@ -37,14 +40,16 @@ RUN apk update && \
 # This copies our app source code into the build container
 COPY . .
 
-RUN mix deps.get --only $MIX_ENV
+RUN mix deps.get --only "${MIX_ENV}"
 RUN mix compile
-RUN mix release core
+RUN echo "Building FunLess ${COMPONENT} in env ${MIX_ENV}"
+RUN MIX_ENV=${MIX_ENV} mix release ${COMPONENT}
 
 # From this line onwards, we're in a new image, which will be the image used in production
 FROM alpine:${ALPINE_VERSION}
 
-ARG MIX_ENV=prod
+ARG MIX_ENV
+ARG COMPONENT
 ARG SECRET_KEY_BASE
 ARG PORT=4000
 ARG NODE_IP=""
@@ -58,6 +63,7 @@ RUN apk update && \
 ENV REPLACE_OS_VARS=true \
     USER=funless \
     MIX_ENV=${MIX_ENV} \ 
+    COMPONENT=${COMPONENT}\
     SECRET_KEY_BASE=${SECRET_KEY_BASE} \
     PORT=${PORT} \
     NODE_IP=${NODE_IP} \
@@ -70,19 +76,15 @@ ENV REPLACE_OS_VARS=true \
 
 
 WORKDIR "/home/${USER}/app"
+
 # Creates an unprivileged user to be used exclusively to run the Phoenix app
 RUN addgroup -g 1000 -S "${USER}" && adduser -s /bin/sh -u 1000 -G "${USER}" \
     -h "/home/${USER}" -D "${USER}" && su "${USER}"
 
 # Everything from this line onwards will run in the context of the unprivileged user.
 USER "${USER}"
 
-COPY --chown="${USER}":"${USER}" --from=builder /opt/app/_build/${MIX_ENV}/rel/core/ .
+COPY --chown="${USER}":"${USER}" --from=builder /opt/app/_build/${MIX_ENV}/rel/${COMPONENT}/ .
 
-# # Usage:
-# #  * build: sudo docker image build -t elixir/my_app .
-# #  * shell: sudo docker container run --rm -it --entrypoint "" -p 127.0.0.1:4000:4000 elixir/my_app sh
-# #  * run:   sudo docker container run --rm -it -p 127.0.0.1:4000:4000 --name my_app elixir/my_app
-# #  * exec:  sudo docker container exec -it my_app sh
-# #  * logs:  sudo docker container logs --follow --tail 100 my_app
-CMD ["sh", "-c", "bin/migrate && bin/seed && bin/server"]
+RUN echo "Command: FunLess ${COMPONENT} in env ${MIX_ENV}"
+CMD  ["sh", "-c", "bin/run"]

Dockerfile.worker

@@ -17,11 +17,16 @@
 SECRET_KEY_BASE ?= $(shell mix phx.gen.secret)
 ## Compile core docker image
 build-core-image: 
-	docker build --build-arg SECRET_KEY_BASE=$(SECRET_KEY_BASE) --build-arg MIX_ENV=prod -t core -f ./Dockerfile.core .
+	docker build \
+	--build-arg SECRET_KEY_BASE=$(SECRET_KEY_BASE) \
+	--build-arg MIX_ENV="prod" \
+	--build-arg COMPONENT="core" \
+	-t core .
 
 ## Compile worker docker image
 build-worker-image: 
-	docker build -t worker -f ./Dockerfile.worker .
+	docker build --build-arg COMPONENT="worker" \
+	--build-arg MIX_ENV="prod" -t worker .
 
 ## Run credo --strict
 credo: 
@@ -35,7 +40,7 @@ dial:
 test: 
 	mix deps.get
 	docker compose -f docker-compose.yml up --detach
-	mix core.test
-	mix worker.test
-	mix core.integration_test
+	mix core.utest
+	mix worker.utest
+	mix core.itest
 	docker compose -f docker-compose.yml down

Makefile

@@ -18,7 +18,7 @@ defmodule Core.MixProject do
   def project do
     [
       app: :core,
-      version: "0.6.0",
+      version: "0.8.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/core/mix.exs

@@ -18,7 +18,7 @@ defmodule Worker.MixProject do
   def project do
     [
       app: :worker,
-      version: "0.6.0",
+      version: "0.8.0",
       build_path: "../../_build",
       config_path: "../../config/config.exs",
       deps_path: "../../deps",

apps/worker/mix.exs

@@ -1,4 +1,4 @@
-# Copyright 2022 Giuseppe De Palma, Matteo Trentin
+# Copyright 2023 Giuseppe De Palma, Matteo Trentin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

rel/overlays/bin/migrate

@@ -0,0 +1,23 @@
+# Copyright 2023 Giuseppe De Palma, Matteo Trentin
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/sh
+cd -P -- "$(dirname -- "$0")"
+echo "Starting $COMPONENT in env $MIX_ENV"
+
+if [ "$COMPONENT" = "core" ]; then
+    sh -c ./migrate && ./seed && ./run_core start
+else
+    sh -c ./run_worker start
+fi

rel/overlays/bin/run

@@ -1,4 +1,4 @@
-# Copyright 2022 Giuseppe De Palma, Matteo Trentin
+# Copyright 2023 Giuseppe De Palma, Matteo Trentin
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.

rel/overlays/bin/server renamed to rel/overlays/bin/run_core

@@ -0,0 +1,22 @@
+# Copyright 2023 Giuseppe De Palma, Matteo Trentin
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/sh
+cd -P -- "$(dirname -- "$0")"
+
+if [[ -z "$NODE_IP" ]]; then
+    DEPLOY_ENV=${DEPLOY_ENV} exec ./worker start
+else
+    RELEASE_NODE=worker@${NODE_IP} DEPLOY_ENV=${DEPLOY_ENV} exec ./worker start
+fi