chore(docker): run as www-data rather than spinnaker (#5117)

spinnaker · Apr 4, 2018 · 709df33 · 709df33
1 parent 19dc6df
commit 709df33
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -6,10 +6,8 @@ COPY docker /opt/deck/docker
 
 WORKDIR /opt/deck
 
-RUN adduser --disabled-password --system spinnaker
-
-USER spinnaker
-
 RUN docker/setup-apache2.sh
 
+USER www-data
+
 CMD docker/run-apache2.sh
diff --git a/docker/run-apache2.sh b/docker/run-apache2.sh
@@ -27,7 +27,6 @@ then
 	# SSL not enabled
 	cp docker/spinnaker.conf.gen spinnaker.conf
 else
-	service apache2 stop
 	a2enmod ssl
 	cp docker/spinnaker.conf.ssl spinnaker.conf
 	sed -ie 's|{%DECK_CERT_PATH%}|'$_DECK_CERT_PATH'|g' spinnaker.conf

diff --git a/docker/setup-apache2.sh b/docker/setup-apache2.sh
@@ -2,3 +2,4 @@ apt-get update
 apt-get install apache2 -y
 service apache2 stop
 a2enmod proxy proxy_ajp proxy_http rewrite deflate headers proxy_balancer proxy_connect proxy_html xml2enc
+chown -R www-data:www-data /etc/apache2