diff --git a/app/Dockerfile b/app/Dockerfile index 5d9b2f7..4a4109f 100644 --- a/app/Dockerfile +++ b/app/Dockerfile @@ -30,6 +30,7 @@ ENV APACHE_PID_FILE /var/run/apache2.pid ENV APACHE_RUN_DIR /var/www/html/ ENV APACHE_LOCK_DIR /var/lock/apache2 + WORKDIR /tmp RUN curl -LO https://sourceforge.net/projects/zencart/files/CURRENT%20-%20Zen%20Cart%201.5.x%20Series/zen-cart-v1.5.7c-03052021.zip/download \ && unzip /tmp/download \ @@ -48,4 +49,6 @@ RUN rm /var/www/html/index.html COPY ./newapache2conf /etc/apache2/apache2.conf +VOLUME /var/www/html + CMD ["/usr/sbin/apache2", "-D", "FOREGROUND"] diff --git a/app/newapache2conf b/app/newapache2conf index f7c62d6..2ed37c9 100644 --- a/app/newapache2conf +++ b/app/newapache2conf @@ -225,3 +225,6 @@ IncludeOptional conf-enabled/*.conf IncludeOptional sites-enabled/*.conf # vim: syntax=apache ts=4 sw=4 sts=4 sr noet + + + diff --git a/docker-compose.yml b/docker-compose.yml index 7a343a4..f7dd71c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,6 +3,8 @@ services: z157: build: ./app/ container_name: zencart_157c + volumes: + - ./html:/var/www/html ports: - "80:80" - "443:443" @@ -14,9 +16,9 @@ services: volumes: - ./dbdata:/var/lib/mysql environment: - MYSQL_ROOT_PASSWORD: ROOTPW440022 - MYSQL_USER: userOK - MYSQL_PASSWORD: better2pass1 + MYSQL_ROOT_PASSWORD: ROOTPW + MYSQL_USER: user + MYSQL_PASSWORD: pass MYSQL_DATABASE: zencart ports: - "3306:3306"