Merge branch 'master' of https://github.com/litespeedtech/ols-docker-env

.env

@@ -1,4 +1,4 @@
-LITESPEED=1.6.4.lh
+LITESPEED=1.6.4.build
 
 MYSQL_DATABASE=wordpress
 MYSQL_ROOT_PASSWORD=password

config/litespeed/1.6.4.build/Dockerfile

@@ -0,0 +1,10 @@
+#FROM debian:jessie-slim
+FROM litespeedtech/openlitespeed-beta:latest
+
+ARG extensions
+
+RUN apt-get install $extensions -y
+
+#RUN echo "admin:$(/usr/local/lsws/admin/fcgi-bin/admin_php* -q /usr/local/lsws/admin/misc/htpasswd.php ${WEB_ADMIN_PASSWORD})" \
+#    > /usr/local/lsws/admin/conf/htpasswd
+

docker-compose.yml

@@ -13,8 +13,12 @@ services:
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
   litespeed:
-    build: ./config/litespeed/${LITESPEED}/
+    build:                                                                                                             
-    image: litespeedtech/openlitespeed-beta:latest
+      context: ./config/litespeed/${LITESPEED}/                                                                        
+      args:
+        extensions: lsphp72 lsphp72-common lsphp72-mysql lsphp72-json                                                                                    
+                                                                                     
+    image: litespeedtech/openlitespeed-beta:travis
     env_file:
       - .env
     volumes:
@@ -26,8 +30,6 @@ services:
       - 80:80
       - 443:443
       - 7080:7080
-    environment:
-      WEB_ADMIN_PASSWORD: ${WEB_ADMIN_PASSWORD}
     restart: always
   adminer:
     image: dockette/adminer:full