diff --git a/docker-compose.yml b/docker-compose.yml index 08b7b65..cdc1b54 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,7 @@ version: '3.8' services: RadioMasterWeb: - image: radiomasterphp + image: yagsWeb build: ./web - volumes: - - ./web:/var/www/html/ - - ./uploads.ini:/usr/local/etc/php/conf.d/uploads.ini ports: - - 8000:80 - -# RadioMasterDb: -# \ No newline at end of file + - 80:80 \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile index 0d701a2..fc806d9 100644 --- a/web/Dockerfile +++ b/web/Dockerfile @@ -1,3 +1,6 @@ FROM php:7-apache +ADD ./ /var/www/html/ +COPY ./uploads.ini /usr/local/etc/php/conf.d/uploads.ini + RUN a2enmod rewrite \ No newline at end of file diff --git a/uploads.ini b/web/uploads.ini similarity index 100% rename from uploads.ini rename to web/uploads.ini diff --git a/web/wsos b/web/wsos index adc340d..467e468 160000 --- a/web/wsos +++ b/web/wsos @@ -1 +1 @@ -Subproject commit adc340db72a8c638bb4dd7ffe03c331cf8634403 +Subproject commit 467e468efd3ef05bf9c6ec884fa79235cfcd04dd