From 6c93880c792dbd7d603c354d6b434de9aba7e38e Mon Sep 17 00:00:00 2001
From: Carlos H Brandt <c.brandt@jacobs-university.de>
Date: Fri, 19 Nov 2021 00:29:04 +0100
Subject: [PATCH] Rearrange some attributes in compose files

---
 dockerfiles/docker-compose.awstats.yml |  2 +-
 dockerfiles/docker-compose.full.yml    | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dockerfiles/docker-compose.awstats.yml b/dockerfiles/docker-compose.awstats.yml
index 71464bb..5ccebd2 100644
--- a/dockerfiles/docker-compose.awstats.yml
+++ b/dockerfiles/docker-compose.awstats.yml
@@ -4,7 +4,7 @@ services:
 
   dachs:
       container_name: dachs
-      image: dachs:${INSTALL_REPO:-latest}
+      image: dachs:latest
       build:
         context: ./dachs
         args:
diff --git a/dockerfiles/docker-compose.full.yml b/dockerfiles/docker-compose.full.yml
index 35c4e66..e0b5750 100644
--- a/dockerfiles/docker-compose.full.yml
+++ b/dockerfiles/docker-compose.full.yml
@@ -3,26 +3,26 @@ version: '3'
 services:
 
   postgres:
+      container_name: postgres
+      image: dachs:postgres
       build:
-        context: ./postgres
+        context: ./dachs
         args:
           PG_VERSION: "${PG_VERSION:-13}"
-      container_name: postgres
-      image: dachs:postgres
       tty: true
       network_mode: 'bridge'
 
   dachs:
+      container_name: dachs
+      image: dachs:server
+      depends_on:
+        - postgres
       build:
         context: ./dachs
         dockerfile: Dockerfile.dachs_server
         args:
           INSTALL_REPO: "${INSTALL_REPO}"
           PG_VERSION: "${PG_VERSION:-13}"
-      container_name: dachs
-      image: dachs:server
-      depends_on:
-        - postgres
       links:
         - postgres
       tty: true