hive-config users: Don't create /etc/hive

gbenson · Oct 8, 2024 · 64aff45 · 64aff45
1 parent d2a6755
commit 64aff45
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/services/email-receiver/Dockerfile b/services/email-receiver/Dockerfile
@@ -43,12 +43,11 @@ RUN ln -s ../../venv/bin/hive-email-receiver /usr/bin
 
 RUN set -eux \
   \
-  && addgroup --system --gid 1936 hiveimap \
+  && addgroup --system --gid 1936 hivemail \
   && adduser --system --uid 1936 --gid 1936 \
-       --home /var/lib/hive/email-receiver --disabled-password hiveimap \
-  && install -d -ohiveimap -ghiveimap -m750 /etc/hive
+       --home /var/lib/hivemail --disabled-password hivemail
 
-USER hiveimap:hiveimap
-WORKDIR /var/lib/hive/email-receiver
+USER hivemail:hivemail
+WORKDIR /var/lib/hivemail
 
 ENTRYPOINT ["hive-email-receiver"]
diff --git a/services/matrix-connector/Dockerfile b/services/matrix-connector/Dockerfile
@@ -51,7 +51,6 @@ RUN set -eux \
   && addgroup --system --gid 6617 matrix \
   && adduser --system --uid 6617 --gid 6617 \
        --home /var/lib/matrix --disabled-password matrix \
-  && install -d -omatrix -gmatrix -m750 /etc/hive
 
 USER matrix:matrix
 WORKDIR /var/lib/matrix
diff --git a/services/reading-list-updater/Dockerfile b/services/reading-list-updater/Dockerfile
@@ -45,10 +45,9 @@ RUN set -eux \
   \
   && addgroup --system --gid 5491 readlist \
   && adduser --system --uid 5491 --gid 5491 \
-       --home /var/lib/hive/reading-list-updater --disabled-password readlist \
-  && install -d -oreadlist -greadlist -m750 /etc/hive
+       --home /var/lib/readlist --disabled-password readlist
 
 USER readlist:readlist
-WORKDIR /var/lib/hive/reading-list-updater
+WORKDIR /var/lib/readlist
 
 ENTRYPOINT ["hive-reading-list-updater"]