improve docker build: init data and htpasswd

Author: cha87de

Dockerfile

@@ -2,7 +2,7 @@ FROM php:7.2-apache
 MAINTAINER alb-TEC engineering <[email protected]>
 
 # prepare for pdf creation
-RUN apt-get update && apt-get install -y texlive-full 
+RUN apt-get update && apt-get install -y texlive-full
 
 # overwrite entrypoint
 COPY docker-php-entrypoint /usr/local/bin/
@@ -18,3 +18,12 @@ RUN ln -s /etc/apache2/sites-available/*.conf /etc/apache2/sites-enabled/
 COPY easycom.tgz /var/www/html
 WORKDIR /var/www/html
 RUN tar xfz easycom.tgz
+
+ENV HTUSER=admin
+ENV HTPASS=admin
+
+VOLUME /var/www/html/easycom-phpbackend/_data
+
+ENTRYPOINT ["docker-php-entrypoint"]
+EXPOSE 80
+CMD ["apache2-foreground"]

docker-php-entrypoint

@@ -4,6 +4,7 @@
 # init easycom:
 ################################################
 
+echo "Prepare storage if not set"
 (
 	cd  /var/www/html/easycom-phpbackend/
 
@@ -20,6 +21,11 @@
 	chown www-data _data -R
 )
 
+echo "Set password from ENV"
+(
+	htpasswd -cb /var/www/html/.htpasswd $HTUSER $HTPASS
+)
+
 ################################################
 # copy of original docker image:
 ################################################

run-dev/.htaccess

@@ -1,3 +1,8 @@
+AuthType Basic
+AuthName "easycom"
+AuthUserFile .htpasswd
+Require valid-user
+
 RewriteEngine on
 RewriteRule ^data/(.*)$         easycom-phpbackend/data/$1 [L,QSA]
 RewriteRule ^action/(.*)$       easycom-phpbackend/action/$1 [L,QSA]