Revert "running as bitwarden user"

This reverts commit 19fa9bf806.

src/Admin/Dockerfile

@@ -1,17 +1,13 @@
 FROM microsoft/aspnetcore:2.0.5
 
-USER root
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 WORKDIR /app
 EXPOSE 80
 COPY obj/Docker/publish .
+
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

src/Api/Dockerfile

@@ -1,6 +1,5 @@
 FROM microsoft/aspnetcore:2.0.5
 
-USER root
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         cron \
@@ -8,23 +7,17 @@ RUN apt-get update \
 
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 WORKDIR /app
 EXPOSE 80
 COPY obj/Docker/publish/Api .
-COPY obj/Docker/publish/Jobs /jobs
 
-USER root
+COPY obj/Docker/publish/Jobs /jobs
 RUN mv /jobs/crontab /etc/cron.d/bitwarden-cron \
     && chmod 0644 /etc/cron.d/bitwarden-cron \
     && touch /var/log/cron.log
 
-USER bitwarden
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

src/Icons/Dockerfile

@@ -1,6 +1,5 @@
 FROM microsoft/aspnetcore:2.0.5
 
-USER root
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         unzip \
@@ -8,8 +7,8 @@ RUN apt-get update \
 
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 WORKDIR /tmp
 COPY iconserver.sha256 .
 RUN curl -L -o iconserver.zip https://github.com/mat/besticon/releases/download/v3.6.0/iconserver_linux_amd64.zip \
@@ -22,9 +21,5 @@ EXPOSE 80
 COPY obj/Docker/publish .
 
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

src/Icons/entrypoint.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
-/iconserver/iconserver &
+/etc/iconserver/iconserver &
 dotnet /app/Icons.dll iconsSettings:bestIconBaseUrl=http://localhost:8080

src/Identity/Dockerfile

@@ -1,17 +1,13 @@
 FROM microsoft/aspnetcore:2.0.5
 
-USER root
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 WORKDIR /app
 EXPOSE 80
 COPY obj/Docker/publish .
+
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

util/Attachments/Dockerfile

@@ -1,11 +1,7 @@
 FROM bitwarden/server
 
-USER bitwarden
 EXPOSE 80
+
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

util/MsSql/Dockerfile

@@ -1,26 +1,18 @@
 FROM microsoft/mssql-server-linux:2017-CU4
 
-USER root
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         cron \
     && rm -rf /var/lib/apt/lists/*
 
-RUN groupadd -g 999 bitwarden && \
-    useradd -r -u 999 -g bitwarden bitwarden
-
 COPY crontab /etc/cron.d/bitwarden-cron
 RUN chmod 0644 /etc/cron.d/bitwarden-cron \
     && touch /var/log/cron.log
 
-USER bitwarden
 COPY backup-db.sql /
 COPY backup-db.sh /
-COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /backup-db.sh
-RUN chmod +x /entrypoint.sh
 
-USER bitwarden
+COPY entrypoint.sh /
+RUN chmod +x /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]

util/Nginx/Dockerfile

@@ -1,17 +1,9 @@
 FROM nginx:1.12
 
-USER root
-RUN groupadd -g 999 bitwarden && \
-    useradd -r -u 999 -g bitwarden bitwarden
-
-USER bitwarden
 COPY nginx.conf /etc/nginx
 COPY proxy.conf /etc/nginx
 COPY mime.types /etc/nginx
+
 COPY entrypoint.sh /
-
-USER root
 RUN chmod +x /entrypoint.sh
-
-USER bitwarden
 ENTRYPOINT ["/entrypoint.sh"]

util/Server/Dockerfile

@@ -1,8 +1,7 @@
 FROM microsoft/aspnetcore:2.0.5
 
-USER root
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 COPY obj/Docker/publish /bitwarden_server

util/Setup/Dockerfile

@@ -1,14 +1,13 @@
 FROM microsoft/dotnet:2.0.5-runtime
 
-USER root
 RUN apt-get update \
     && apt-get install -y --no-install-recommends \
         openssl \
-    && rm -rf /var/lib/apt/lists/*
+&& rm -rf /var/lib/apt/lists/*
 
 RUN groupadd -g 999 bitwarden && \
     useradd -r -u 999 -g bitwarden bitwarden
-
 USER bitwarden
+
 WORKDIR /app
 COPY obj/Docker/publish .