From 9ee7be4a1c8299010df384e91c8e56ec25cc925a Mon Sep 17 00:00:00 2001
From: Kevin Morris <kevr@0cost.org>
Date: Sat, 26 Jun 2021 00:33:32 -0700
Subject: [PATCH] Docker: remove web/locale from volume mounts

This caused a bug where generated locale would not be used.

Also, removed appending to /etc/hosts which was bugging out
on Mac OS X. archlinux:base-devel seems to come with a valid
/etc/hosts.

Additionally, remove AUR_CONFIG from Dockerfile. We don't
set it up; just use the defaults during installation.

Signed-off-by: Kevin Morris <kevr@0cost.org>
---
 Dockerfile         |  3 ---
 docker-compose.yml | 28 +++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5fd3ec07..da9c8d3b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,6 @@
 FROM archlinux:base-devel
 
 # Setup some default system stuff.
-RUN bash -c 'echo "127.0.0.1 localhost" >> /etc/hosts'
-RUN bash -c 'echo "::1 localhost" >> /etc/hosts'
 RUN ln -sf /usr/share/zoneinfo/UTC /etc/localtime
 
 RUN mkdir -p .pkg-cache
@@ -28,6 +26,5 @@ WORKDIR /aurweb
 COPY . .
 
 ENV PYTHONPATH=/aurweb
-ENV AUR_CONFIG=conf/config
 
 RUN make -C po all install
diff --git a/docker-compose.yml b/docker-compose.yml
index c2c948f5..795236c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -116,7 +116,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   fastapi:
@@ -148,7 +150,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   nginx:
@@ -180,7 +184,9 @@ services:
       - git_data:/aurweb/aur.git
       - ./cache:/cache
       - ./logs:/var/log/nginx
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
 
   sharness:
     image: aurweb:latest
@@ -202,7 +208,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   pytest-mysql:
@@ -229,7 +237,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
   pytest-sqlite:
@@ -248,7 +258,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
     depends_on:
       git:
@@ -277,7 +289,9 @@ services:
       - ./aurweb:/aurweb/aurweb
       - ./migrations:/aurweb/migrations
       - ./test:/aurweb/test
-      - ./web:/aurweb/web
+      - ./web/html:/aurweb/web/html
+      - ./web/template:/aurweb/web/template
+      - ./web/lib:/aurweb/web/lib
       - ./templates:/aurweb/templates
 
 volumes: