diff --git a/srcs/PostgreSQL/Dockerfile b/srcs/PostgreSQL/Dockerfile deleted file mode 100644 index e69de29..0000000 diff --git a/srcs/docker-compose.yml b/srcs/docker-compose.yml new file mode 100644 index 0000000..57fb899 --- /dev/null +++ b/srcs/docker-compose.yml @@ -0,0 +1,42 @@ +version: '3' + +services: + nginx: + container_name: nginx + volumes: + - djangoserver:/var/www/djangoserver + networks: + - transcendence + depends_on: + - djangoserver + build: + context: requirements/nginx + dockerfile: Dockerfile + ports: + - "443:443" + restart: on-failure + + djangoserver: + container_name: djangoserver + volumes: + - djangoserver:/var/www/djangoserver + networks: + - transcendence + build: + context: requirements/djangoserver + dockerfile: Dockerfile + restart: on-failure + expose: + - "9000" + +volumes: + djangoserver: + driver: local + driver_opts: + type: 'none' + o: 'bind' + device: '/home/edbernar/data/djangoserver' + +networks: + transcendence: + driver: bridge diff --git a/srcs/DjangoServer/Dockerfile b/srcs/requirements/PostgreSQL/Dockerfile similarity index 100% rename from srcs/DjangoServer/Dockerfile rename to srcs/requirements/PostgreSQL/Dockerfile diff --git a/srcs/requirements/djangoserver/Dockerfile b/srcs/requirements/djangoserver/Dockerfile new file mode 100644 index 0000000..30cce97 --- /dev/null +++ b/srcs/requirements/djangoserver/Dockerfile @@ -0,0 +1,18 @@ +FROM debian:buster + +RUN apt update && apt upgrade -y + +RUN apt install -y python +RUN apt install -y python3-pip +RUN pip3 install django + + +RUN mkdir -p /var/www/djangoserver/ +RUN mkdir -p /var/www/djangoserver/static/ +COPY file/server /var/www/djangoserver/server +RUN chmod 755 /var/www/djangoserver/ +RUN chown -R www-data:www-data /var/www/djangoserver/ + +WORKDIR /var/www/djangoserver + +ENTRYPOINT [ "python", "/var/www/djangoserver/server/main.py" ] \ No newline at end of file diff --git a/srcs/requirements/djangoserver/file/server/main.py b/srcs/requirements/djangoserver/file/server/main.py new file mode 100644 index 0000000..16692bf --- /dev/null +++ b/srcs/requirements/djangoserver/file/server/main.py @@ -0,0 +1,5 @@ +import time + +while True: + print("Update") + time.sleep(20) \ No newline at end of file diff --git a/srcs/Nginx/Dockerfile b/srcs/requirements/nginx/Dockerfile similarity index 59% rename from srcs/Nginx/Dockerfile rename to srcs/requirements/nginx/Dockerfile index b561e8c..50b7625 100644 --- a/srcs/Nginx/Dockerfile +++ b/srcs/requirements/nginx/Dockerfile @@ -3,9 +3,4 @@ FROM nginx:latest RUN mkdir -p /etc/nginx/ssl RUN apt install -y openssl RUN openssl req -x509 -nodes -out /etc/nginx/ssl/inception.crt -keyout /etc/nginx/ssl/inception.key -subj "/C=FR/ST=IDF/L=Paris/O=42/OU=42/CN=ptme.com/UID=ptme" -RUN mkdir -p /var/www/PTME/ -RUN mkdir -p /var/www/PTME/static/ -RUN chmod 755 /var/www/PTME/ -RUN chown -R www-data:www-data /var/www/PTME/ -RUN echo "Heyyy\n" > /var/www/PTME/static/text.txt COPY conf/nginx.conf /etc/nginx/nginx.conf diff --git a/srcs/Nginx/conf/nginx.conf b/srcs/requirements/nginx/conf/nginx.conf similarity index 87% rename from srcs/Nginx/conf/nginx.conf rename to srcs/requirements/nginx/conf/nginx.conf index 2b1bf04..39c326b 100644 --- a/srcs/Nginx/conf/nginx.conf +++ b/srcs/requirements/nginx/conf/nginx.conf @@ -20,10 +20,10 @@ http { ssl_certificate /etc/nginx/ssl/inception.crt; ssl_certificate_key /etc/nginx/ssl/inception.key; - root /var/www/PTME/; + root /var/www/djangoserver/; location /static/ { - alias /var/www/PTME/; + alias /var/www/djangoserver/static/; } location / {