From 5b81181ea36c9c421e43a1cf46ec6f9b8642f76d Mon Sep 17 00:00:00 2001
From: Chris McCord <chris@chrismccord.com>
Date: Wed, 8 Dec 2021 13:07:39 -0500
Subject: [PATCH] Bump for latest gen.release

---
 Dockerfile                   |  8 ++++++--
 config/runtime.exs           | 20 ++++++++++----------
 fly.toml                     |  2 --
 rel/overlays/bin/migrate     |  2 +-
 rel/overlays/bin/migrate.bat |  1 +
 rel/overlays/bin/server      |  2 +-
 rel/overlays/bin/server.bat  |  2 ++
 7 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100755 rel/overlays/bin/migrate.bat
 create mode 100755 rel/overlays/bin/server.bat

diff --git a/Dockerfile b/Dockerfile
index b76a7c9..9e05985 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,9 @@
 #   - https://hub.docker.com/r/hexpm/elixir/tags - for the build image
 #   - https://hub.docker.com/_/debian?tab=tags&page=1&name=bullseye-20210902-slim - for the release image
 #   - https://pkgs.org/ - resource for finding needed packages
-#   - Ex: hexpm/elixir:1.12.3-erlang-24.1.4-debian-bullseye-20210902-slim
+#   - Ex: hexpm/elixir:1.12.0-erlang-24.0.1-debian-bullseye-20210902-slim
 #
-ARG BUILDER_IMAGE="hexpm/elixir:1.12.3-erlang-24.1.4-debian-bullseye-20210902-slim"
+ARG BUILDER_IMAGE="hexpm/elixir:1.12.0-erlang-24.0.1-debian-bullseye-20210902-slim"
 ARG RUNNER_IMAGE="debian:bullseye-20210902-slim"
 
 FROM ${BUILDER_IMAGE} as builder
@@ -86,4 +86,8 @@ COPY --from=builder --chown=nobody:root /app/_build/prod/rel/live_beats ./
 
 USER nobody
 
+# Set the runtime ENV
+ENV ECTO_IPV6="true"
+ENV ERL_AFLAGS="-proto_dist inet6_tcp"
+
 CMD /app/bin/server
\ No newline at end of file
diff --git a/config/runtime.exs b/config/runtime.exs
index 5d676a9..db0b097 100644
--- a/config/runtime.exs
+++ b/config/runtime.exs
@@ -6,6 +6,11 @@ import Config
 # and secrets from environment variables or elsewhere. Do not define
 # any compile-time configuration in here, as it won't be applied.
 # The block below contains prod specific runtime configuration.
+
+if System.get_env("PHX_SERVER") && System.get_env("RELEASE_NAME") do
+  config :live_beats, LiveBeatsWeb.Endpoint, server: true
+end
+
 if config_env() == :prod do
   database_url =
     System.get_env("DATABASE_URL") ||
@@ -14,7 +19,6 @@ if config_env() == :prod do
       For example: ecto://USER:PASS@HOST/DATABASE
       """
 
-  server? = System.get_env("PHX_SERVER") == "true"
   host = System.get_env("PHX_HOST") || "example.com"
   ecto_ipv6? = System.get_env("ECTO_IPV6") == "true"
 
@@ -31,7 +35,6 @@ if config_env() == :prod do
       You can generate one by calling: mix phx.gen.secret
       """
 
-
   config :live_beats, LiveBeatsWeb.Endpoint,
     url: [host: host, port: 80],
     http: [
@@ -42,16 +45,13 @@ if config_env() == :prod do
       ip: {0, 0, 0, 0, 0, 0, 0, 0},
       port: String.to_integer(System.get_env("PORT") || "4000")
     ],
-    secret_key_base: secret_key_base,
-    server: server?
+    secret_key_base: secret_key_base
 
-  config :live_beats, :files, [
+  config :live_beats, :files,
     uploads_dir: "/app/uploads",
-    host: [scheme: "https", host: host, port: 443],
-  ]
+    host: [scheme: "https", host: host, port: 443]
 
-  config :live_beats, :github, [
+  config :live_beats, :github,
     client_id: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_ID"),
-    client_secret: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_SECRET"),
-  ]
+    client_secret: System.fetch_env!("LIVE_BEATS_GITHUB_CLIENT_SECRET")
 end
diff --git a/fly.toml b/fly.toml
index 3bed91a..51f6bcc 100644
--- a/fly.toml
+++ b/fly.toml
@@ -9,8 +9,6 @@ processes = []
 
 [env]
   PHX_HOST = "livebeats.fly.dev"
-  ECTO_IPV6 = "true"
-  ERL_AFLAGS = "-proto_dist inet6_tcp"
 
 [mounts]
   source="data"
diff --git a/rel/overlays/bin/migrate b/rel/overlays/bin/migrate
index 6a71841..ba7b5fd 100755
--- a/rel/overlays/bin/migrate
+++ b/rel/overlays/bin/migrate
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd -P -- "$(dirname -- "$0")"
-./live_beats eval LiveBeats.Release.migrate
\ No newline at end of file
+exec ./live_beats eval LiveBeats.Release.migrate
\ No newline at end of file
diff --git a/rel/overlays/bin/migrate.bat b/rel/overlays/bin/migrate.bat
new file mode 100755
index 0000000..8c92ce0
--- /dev/null
+++ b/rel/overlays/bin/migrate.bat
@@ -0,0 +1 @@
+call "%~dp0\live_beats" eval LiveBeats.Release.migrate
\ No newline at end of file
diff --git a/rel/overlays/bin/server b/rel/overlays/bin/server
index 1400471..2a92108 100755
--- a/rel/overlays/bin/server
+++ b/rel/overlays/bin/server
@@ -1,3 +1,3 @@
 #!/bin/sh
 cd -P -- "$(dirname -- "$0")"
-PHX_SERVER=true ./live_beats start
+PHX_SERVER=true exec ./live_beats start
diff --git a/rel/overlays/bin/server.bat b/rel/overlays/bin/server.bat
new file mode 100755
index 0000000..c376ff0
--- /dev/null
+++ b/rel/overlays/bin/server.bat
@@ -0,0 +1,2 @@
+set PHX_SERVER=true
+call "%~dp0\live_beats" start
\ No newline at end of file