From aece7c4277ba152c1df39cc11f67882e5b8bb3c7 Mon Sep 17 00:00:00 2001 From: Jenihacker <20cs064.jenison@sjec.ac.in> Date: Tue, 28 Mar 2023 11:10:50 +0530 Subject: [PATCH 1/2] added index.html --- Git/index.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 Git/index.html diff --git a/Git/index.html b/Git/index.html new file mode 100644 index 0000000..f87e789 --- /dev/null +++ b/Git/index.html @@ -0,0 +1,12 @@ + + + + + + + Index + + +

hello world

+ + \ No newline at end of file From e8806987d15091ec1b82c953814f78cc2603ef6e Mon Sep 17 00:00:00 2001 From: Jenihacker <20cs064.jenison@sjec.ac.in> Date: Tue, 28 Mar 2023 14:42:40 +0530 Subject: [PATCH 2/2] added docker file --- Docker/code/Dockerfile | 6 +++--- Docker/code/docker-compose.yml | 22 +++++++++++----------- Docker/code/docker/Dockerfile | 3 +++ Docker/code/docker/docker-compose.yml | 11 +++++++++++ Docker/code/public/index.html | 2 +- 5 files changed, 29 insertions(+), 15 deletions(-) create mode 100644 Docker/code/docker/Dockerfile create mode 100644 Docker/code/docker/docker-compose.yml diff --git a/Docker/code/Dockerfile b/Docker/code/Dockerfile index be6612e..223d5af 100644 --- a/Docker/code/Dockerfile +++ b/Docker/code/Dockerfile @@ -1,3 +1,3 @@ -# FROM nginx:1.23.0-alpine -# COPY /public /usr/share/nginx/html -# CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file +FROM nginx:1.23.0-alpine +COPY /public /usr/share/nginx/html +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/Docker/code/docker-compose.yml b/Docker/code/docker-compose.yml index cae06e3..4a93901 100644 --- a/Docker/code/docker-compose.yml +++ b/Docker/code/docker-compose.yml @@ -1,11 +1,11 @@ -# version: '3.7' -# services: -# webserver: -# build: -# context: . -# dockerfile: docker/Dockerfile -# container_name: webserver -# ports: -# - 9000:80 -# volumes: -# - ./public:/usr/share/nginx/html +version: '3.7' +services: + webserver: + build: + context: . + dockerfile: docker/Dockerfile + container_name: webserver + ports: + - 9000:80 + volumes: + - ./public:/usr/share/nginx/html diff --git a/Docker/code/docker/Dockerfile b/Docker/code/docker/Dockerfile new file mode 100644 index 0000000..223d5af --- /dev/null +++ b/Docker/code/docker/Dockerfile @@ -0,0 +1,3 @@ +FROM nginx:1.23.0-alpine +COPY /public /usr/share/nginx/html +CMD ["nginx", "-g", "daemon off;"] \ No newline at end of file diff --git a/Docker/code/docker/docker-compose.yml b/Docker/code/docker/docker-compose.yml new file mode 100644 index 0000000..4a93901 --- /dev/null +++ b/Docker/code/docker/docker-compose.yml @@ -0,0 +1,11 @@ +version: '3.7' +services: + webserver: + build: + context: . + dockerfile: docker/Dockerfile + container_name: webserver + ports: + - 9000:80 + volumes: + - ./public:/usr/share/nginx/html diff --git a/Docker/code/public/index.html b/Docker/code/public/index.html index b71221b..3670245 100644 --- a/Docker/code/public/index.html +++ b/Docker/code/public/index.html @@ -1,6 +1,6 @@ - Docker Workshop + Workshop

Welcome to Docker Workshop