diff --git a/Dockerfile b/Dockerfile index 01cc4375a4d2c72844b0b78cfaf622fbc2dfd7a9..46e3adb512f4baeacd924678f36849aee3735115 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,4 +6,4 @@ RUN apt-get install -y libpq-dev \ RUN a2enmod rewrite \ && service apache2 restart RUN apt install -y ffmpeg -#COPY src/web .htaccess /var/www/html/ \ No newline at end of file +COPY src/web /var/www/html/ \ No newline at end of file diff --git a/Dockerfile-obj b/Dockerfile-obj index 4928d4b7c0c8332d6a215a20f74dd56e6b3e1c56..a70de058320f1f4ff6985e9290d2e73a6942efb7 100644 --- a/Dockerfile-obj +++ b/Dockerfile-obj @@ -3,4 +3,4 @@ RUN apt update \ && apt install vim -y RUN a2enmod rewrite \ && service apache2 restart -#COPY src/obj-storage .htaccess /var/www/html/ \ No newline at end of file +COPY src/obj-storage /var/www/html/ \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index a1e826a47bc1f67b49d1c02324cfc36bb6e54052..656f90afdf51a06f538b77e245b352078006f962 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,8 +11,6 @@ services: DB_USERNAME: "web" DB_PASS: "web" OBJ_STORAGE_PASS: "$2y$10$SVu1w2aJ3pn9JJApJdjXpO.sa7HZCRnlnn6kv5Yq.0n6gp8Pj0Cy2" - volumes: - - ./src/web:/var/www/html/:ro networks: - all-bridge depends_on: @@ -41,7 +39,6 @@ services: OBJ_LOCATION: "/opt/obj_storage" volumes: - object-storage:/opt/obj_storage:rw - - ./src/obj-storage:/var/www/html/:ro networks: - all-bridge depends_on: