From 4d4d4e2a2996549891f2e7ff9fe23faea481d449 Mon Sep 17 00:00:00 2001
From: ange <ange@yw5n.com>
Date: Wed, 28 Feb 2024 13:21:54 +0100
Subject: [PATCH] fix: useradd before anything else

---
 _template/Dockerfile | 2 +-
 bazarr/Dockerfile    | 2 +-
 lidarr/Dockerfile    | 2 +-
 monero/Dockerfile    | 5 ++---
 monero/compose.yaml  | 2 --
 prowlarr/Dockerfile  | 2 +-
 radarr/Dockerfile    | 2 +-
 readarr/Dockerfile   | 2 +-
 sonarr/Dockerfile    | 2 +-
 9 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/_template/Dockerfile b/_template/Dockerfile
index 4b16af5..ecdf444 100644
--- a/_template/Dockerfile
+++ b/_template/Dockerfile
@@ -12,9 +12,9 @@ ARG APP="http://app.com/download"
 RUN curl -L "$APP" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 COPY --from=build /app/ .
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 80
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/bazarr/Dockerfile b/bazarr/Dockerfile
index c1ab672..8cddb83 100644
--- a/bazarr/Dockerfile
+++ b/bazarr/Dockerfile
@@ -22,10 +22,10 @@ RUN curl -LO "$URL"                                      \
     && rm bazarr.zip
 
 FROM base
+RUN useradd -m app
 COPY --from=build /app/ .
 COPY --from=build "$VIRTUAL_ENV" "$VIRTUAL_ENV"
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 6767
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/lidarr/Dockerfile b/lidarr/Dockerfile
index 3c4e4c9..776abe7 100644
--- a/lidarr/Dockerfile
+++ b/lidarr/Dockerfile
@@ -12,6 +12,7 @@ ARG LIDARR="http://lidarr.servarr.com/v1/update/master/updatefile?os=linux&runti
 RUN curl -L "$LIDARR" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 RUN apt-get update                                \
     && apt-get install -y --no-install-recommends \
         ca-certificates                           \
@@ -21,7 +22,6 @@ RUN apt-get update                                \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/ .
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 8686
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/monero/Dockerfile b/monero/Dockerfile
index d0c46c7..175a602 100644
--- a/monero/Dockerfile
+++ b/monero/Dockerfile
@@ -13,10 +13,9 @@ ARG MONERO='https://downloads.getmonero.org/cli/linux64'
 RUN curl -L "$MONERO" | tar xj --strip-components=1
 
 FROM base
-COPY --from=build /app/ .
 RUN useradd -m app
-RUN mkdir -p            /home/app/.bitmonero/ /wallet/ \
-    && chown -R app:app /home/app/            /wallet/
+COPY --from=build /app/ .
+RUN mkdir -p /home/app/.bitmonero/ && chown -R app:app /home/app/
 VOLUME /home/app/.bitmonero/ /wallet/
 EXPOSE 18080 18081
 USER app
diff --git a/monero/compose.yaml b/monero/compose.yaml
index 6cc57c1..2294769 100644
--- a/monero/compose.yaml
+++ b/monero/compose.yaml
@@ -7,9 +7,7 @@ services:
       - "18080:18080"
       - "18081:18081"
     volumes:
-      - wallet:/wallet/
       - blocks:/home/app/.bitmonero/
 
 volumes:
-  wallet:
   blocks:
diff --git a/prowlarr/Dockerfile b/prowlarr/Dockerfile
index 8a91f71..ae94f8d 100644
--- a/prowlarr/Dockerfile
+++ b/prowlarr/Dockerfile
@@ -12,6 +12,7 @@ ARG PROWLARR="http://prowlarr.servarr.com/v1/update/develop/updatefile?os=linux&
 RUN curl -L "$PROWLARR" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 RUN apt-get update                                \
     && apt-get install -y --no-install-recommends \
         ca-certificates                           \
@@ -19,7 +20,6 @@ RUN apt-get update                                \
         sqlite3                                   \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/ .
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 9696
 CMD ["./Prowlarr", "-nobrowser", "-data=/config"]
diff --git a/radarr/Dockerfile b/radarr/Dockerfile
index 35b76d5..31b5c34 100644
--- a/radarr/Dockerfile
+++ b/radarr/Dockerfile
@@ -12,6 +12,7 @@ ARG RADARR="http://radarr.servarr.com/v1/update/master/updatefile?os=linux&runti
 RUN curl -L "$RADARR" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 RUN apt-get update                                \
     && apt-get install -y --no-install-recommends \
         ca-certificates                           \
@@ -20,7 +21,6 @@ RUN apt-get update                                \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/ .
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 7878
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/readarr/Dockerfile b/readarr/Dockerfile
index 6263dc5..66f1e53 100644
--- a/readarr/Dockerfile
+++ b/readarr/Dockerfile
@@ -12,6 +12,7 @@ ARG READARR="https://readarr.servarr.com/v1/update/develop/updatefile?os=linux&r
 RUN curl -L "$READARR" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 RUN apt-get update                                \
     && apt-get install -y --no-install-recommends \
         ca-certificates                           \
@@ -20,7 +21,6 @@ RUN apt-get update                                \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/ .
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 8787
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/sonarr/Dockerfile b/sonarr/Dockerfile
index eb0fe87..000c374 100644
--- a/sonarr/Dockerfile
+++ b/sonarr/Dockerfile
@@ -12,6 +12,7 @@ ARG SONARR="https://services.sonarr.tv/v1/download/main/latest?version=4&os=linu
 RUN curl -L "$SONARR" | tar xz --strip-components=1
 
 FROM base
+RUN useradd -m app
 RUN apt-get update                                \
     && apt-get install -y --no-install-recommends \
         libicu72                                  \
@@ -20,7 +21,6 @@ RUN apt-get update                                \
     && rm -rf /var/lib/apt/lists/*
 COPY --from=build /app/ .
 COPY entrypoint.sh /usr/local/bin/
-RUN useradd -m app
 VOLUME /config/
 EXPOSE 8989
 ENTRYPOINT ["entrypoint.sh"]