fix: fix issues when generating systemd service file for use with Docker

arcanemachine · Oct 6, 2023 · a3189b2 · a3189b2
1 parent 4bc1d2d
commit a3189b2
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/support/containers/compose.phoenix-postgres.yaml b/support/containers/compose.phoenix-postgres.yaml
@@ -3,14 +3,13 @@ services:
   phoenix:
     depends_on:
       - "postgres"
-  # # use this if you are using a standalone postgres container with this project
-  # networks:
-  #   - "phoenix-todo-list"
+    networks:
+      - "phoenix-todo-list"
   postgres:
     networks:
       - "phoenix-todo-list"
     ports:
       - "5432"
-# use this if you are using a standalone postgres container with this project
-# networks:
-#   phoenix-todo-list:
+
+networks:
+  phoenix-todo-list:
diff --git a/support/containers/networks/compose.phoenix-traefik.yaml b/support/containers/networks/compose.phoenix-traefik.yaml
@@ -5,7 +5,7 @@ services:
       DATABASE_URL: "${DATABASE_URL:?}"
     networks:
       - "traefik-global-proxy"
-      - "postgres" # use this if you are running a postgres container outside of this project's compose service
+      # - "postgres" # uncomment this line if you are running a postgres container outside of this project's compose service
     ports:
       - "${PORT:?}"
     labels:
@@ -16,5 +16,4 @@ services:
 networks:
   traefik-global-proxy:
     external: true
-  postgres: # use this if you are running a postgres container outside of this project's compose service
-    external: true
+# postgres: # uncomment this line if you are running a postgres container outside of this project's compose service
diff --git a/support/scripts/systemd-container-service-file-generate b/support/scripts/systemd-container-service-file-generate
@@ -113,11 +113,12 @@ else
 fi
 
 # maybe use podman instead of docker
-# use_podman
 if [ "$use_podman" = 1 ]; then
   # configure service for use with podman
   podman_socket_path=$(podman info --format '{{.Host.RemoteSocket.Path}}')
   maybe_podman_config=" -H unix:${podman_socket_path}"
+else
+  use_docker=1 # use docker-specific options in the systemd service file
 fi
 
 # set $deployment_type based on whether or not the '--remote' flag was passed
@@ -177,10 +178,11 @@ fi
 # generate the service file
 echo "[Unit]
 Description=$service_name
-Wants=network-online.target
-After=network-online.target
-Requires=podman.service
-RequiresMountsFor=/run/user/$(id -u)/containers
+${use_docker:+After=docker.service}
+${use_podman:+Wants=network-online.target}
+${use_podman:+After=network-online.target}
+${use_podman:+Requires=podman.service}
+${use_podman:+RequiresMountsFor=/run/user/$(id -u)/containers}
 
 [Service]
 Restart=always
@@ -196,7 +198,7 @@ Environment=COMPOSE_HTTP_TIMEOUT=180
 
 ## phoenix
 Environment=PHX_HOST=\"$PHX_HOST\"
-Environment=PORT=\"$PORT\"
+Environment=PORT=$PORT
 Environment=SECRET_KEY_BASE=\"$SECRET_KEY_BASE\"
 
 ## database