From 87641a0714551a2b0dbd8d45ac57e87bc0868e9d Mon Sep 17 00:00:00 2001
From: Kevin Baensch <kb@ujamii.com>
Date: Fri, 23 Dec 2022 09:43:17 +0100
Subject: [PATCH] Merge compose configurations.

---
 docker-compose-sqlproxy.yml | 24 ------------------------
 docker-compose.yml          | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 24 deletions(-)
 delete mode 100644 docker-compose-sqlproxy.yml

diff --git a/docker-compose-sqlproxy.yml b/docker-compose-sqlproxy.yml
deleted file mode 100644
index dc21c4c..0000000
--- a/docker-compose-sqlproxy.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "3.4"
-
-services:
-  sshd:
-    build:
-      context: .
-      dockerfile: ./Dockerfile
-    command: ["./sqlproxy.sh", "&", "wait", "$!" ]
-    ports:
-      - 3022:22
-    volumes:
-      - ./etc/ssh:/etc/ssh/
-      - ./script/sqlproxy.sh:/sqlproxy.sh:ro
-      - ./script/sqlproxy_cli.sh:/sqlproxy_cli.sh:ro
-      - ./config:/config
-    environment:
-      DISABLE_KEYGEN: true
-      DISABLE_CONFIG_GEN: true
-      HOST_CONF_PATH: /etc/hosts
-      RESOLVE_DOCKERHOST: true
-      DOCKER_HOSTNAME_VAR: DB_VHOST
-    networks:
-      - proxy
-    restart: unless-stopped
diff --git a/docker-compose.yml b/docker-compose.yml
index 9cd3bb8..d3542bd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       - /etc/hosts:/config/hosts:rw
     networks:
       - proxy
+    restart: unless-stopped
   proxy:
     image: caddy:2.6.2-alpine
     ports:
@@ -23,6 +24,25 @@ services:
       - ./caddy_data:/data/caddy
     networks:
       - proxy
+    restart: unless-stopped
+  sshd:
+    build:
+      context: .
+      dockerfile: ./Dockerfile
+    command: ["./sqlproxy.sh", "&", "wait", "$!" ]
+    ports:
+      - 3022:22
+    volumes:
+      - ./etc/ssh:/etc/ssh/
+      - ./script/sqlproxy.sh:/sqlproxy.sh:ro
+      - ./script/sqlproxy_cli.sh:/sqlproxy_cli.sh:ro
+      - ./config:/config
+    environment:
+      DISABLE_KEYGEN: true
+      DISABLE_CONFIG_GEN: true
+    networks:
+      - proxy
+    restart: unless-stopped
 
 networks:
   proxy: