Improve deploy and fix warnings

Author: vtm9

Containerfile.codebattle

@@ -83,4 +83,4 @@ EXPOSE ${PORT}
 WORKDIR /opt/app
 COPY --from=compile-image /opt/release .
 COPY Makefile Makefile
-CMD exec /opt/app/bin/codebattle start
+CMD ["/opt/app/bin/codebattle", "start"]

Containerfile.runner

@@ -48,4 +48,4 @@ EXPOSE ${PORT}
 WORKDIR /opt/app
 COPY --from=compile-image /opt/release .
 COPY Makefile Makefile
-CMD exec /opt/app/bin/runner start
+CMD ["/opt/app/bin/runner", "start"]

Makefile

@@ -1,8 +1,83 @@
-ROOT_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-include $(ROOT_DIR)make-compose.mk
-
 BUILDX_OUTPUT ?= --load
 
+compose:
+	docker compose up app
+
+compose-d:
+	docker compose up -d app
+
+compose-build:
+	docker compose build --build-arg GIT_HASH=$(shell git rev-parse HEAD) app
+
+compose-down:
+	docker compose down -v || true
+
+compose-test-code-checkers:
+	docker compose run --rm --name codebattle_app app mix test image_executor
+
+compose-test-fe:
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm test'
+
+compose-test:
+	docker compose run --rm --name codebattle_app app mix test --exclude image_executor
+
+compose-kill:
+	docker compose kill
+
+compose-bash:
+	docker compose run app bash
+
+compose-install-mix:
+	docker compose run --rm --name codebattle_app app mix deps.get
+
+compose-install-pnpm:
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm install && pnpm run build:mem'
+
+compose-install: compose-install-mix compose-install-pnpm
+
+compose-setup: compose-down compose-build compose-install compose-db-setup
+
+compose-db-setup:
+	docker compose run --rm --name codebattle_app app mix ecto.setup
+
+compose-db-migrate:
+	docker compose run --rm --name codebattle_app app mix ecto.migrate
+
+compose-lint: compose-mix-format compose-mix-credo compose-lint-js-fix
+
+compose-mix-format:
+	docker compose run --rm --name codebattle_app app mix format
+
+compose-mix-credo:
+	docker compose run app mix credo
+
+compose-lint-js-fix:
+	docker compose run --rm --name codebattle_app app /bin/sh -c 'cd /app/apps/codebattle && pnpm run lint --fix'
+
+compose-console:
+	docker compose run --rm --name codebattle_app app iex -S mix
+
+compose-restart:
+	docker compose restart
+
+compose-stop:
+	docker compose stop
+
+compose-logs:
+	docker compose logs -f --tail=100
+
+compose-compile:
+	docker compose  run --rm --name codebattle_app app mix compile
+
+compose-build-images:
+	docker compose run --rm --name codebattle_app app mix images.build ${lang}
+
+compose-pull-images:
+	docker compose run --rm --name codebattle_app app mix images.pull ${lang}
+
+compose-push-images:
+	docker compose run --rm --name codebattle_app app mix images.push ${lang}
+
 pg:
 	docker compose up -d db-local
 

config/releases.exs config/runtime.exsconfig/releases.exs renamed to config/runtime.exs

@@ -9,9 +9,12 @@ spec:
     matchLabels:
       app: "runner"
   strategy:
+    type: {{ default "RollingUpdate" .Values.runner.updateStrategy.type }}
+    {{- if eq (default "RollingUpdate" .Values.runner.updateStrategy.type) "RollingUpdate" }}
     rollingUpdate:
-      maxUnavailable: 0
-      maxSurge: 1
+      maxUnavailable: {{ default 0 .Values.runner.updateStrategy.rollingUpdate.maxUnavailable }}
+      maxSurge: {{ default 1 .Values.runner.updateStrategy.rollingUpdate.maxSurge }}
+    {{- end }}
   template:
     metadata:
       labels:

k8s/app-chart/templates/runner_deployment.yaml

@@ -54,6 +54,11 @@ runner:
   replicaCount: 1
   antiAffinity:
     required: true
+  updateStrategy:
+    type: RollingUpdate
+    rollingUpdate:
+      maxUnavailable: 0
+      maxSurge: 1
   # Deployment or DaemonSet
   type: Deployment
   image:

k8s/app-chart/values.yaml

@@ -20,6 +20,8 @@ runner:
   replicaCount: 1
   antiAffinity:
     required: false
+  updateStrategy:
+    type: Recreate
 
 zigRunners:
   strategy: simple

k8s/envs/simple/values.yaml

@@ -27,10 +27,12 @@ defmodule CodebattleUmbrella.MixProject do
       releases: [
         codebattle: [
           applications: [codebattle: :permanent],
+          runtime_config_path: "config/runtime.exs",
           validate_compile_env: false
         ],
         runner: [
           applications: [runner: :permanent],
+          runtime_config_path: "config/runtime.exs",
           validate_compile_env: false
         ]
       ]