Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Docker/code/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# FROM nginx:1.23.0-alpine
# COPY /public /usr/share/nginx/html
# CMD ["nginx", "-g", "daemon off;"]
FROM nginx:1.23.0-alpine
COPY /public /usr/share/nginx/html
CMD ["nginx", "-g", "daemon off;"]
22 changes: 11 additions & 11 deletions Docker/code/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions Docker/code/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FROM nginx:1.23.0-alpine
COPY /public /usr/share/nginx/html
CMD ["nginx", "-g", "daemon off;"]
11 changes: 11 additions & 0 deletions Docker/code/docker/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Docker/code/public/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<html>
<head>
<title>Docker Workshop</title>
<title>Workshop</title>
</head>
<body>
<h1>Welcome to Docker Workshop</h1>
Expand Down
12 changes: 12 additions & 0 deletions Git/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Index</title>
</head>
<body>
<h1>hello world</h1>
</body>
</html>