Skip to content

Commit 8ce4a3f

Browse files
Merge pull request #12 from PythonGermany/docker-image-refinement
Docker image refinement
2 parents 7124f46 + 5db16ec commit 8ce4a3f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ RUN ln -s /etc/webserv/sites-available/default.conf /etc/webserv/sites-enabled/
2020
RUN mkdir -p /var/www/html
2121
COPY --from=build-stage /app/websites/default/index.html /var/www/html/
2222

23-
EXPOSE 8080
23+
EXPOSE 80
2424

25-
CMD ["/usr/bin/webserv"]
25+
CMD ["/usr/bin/webserv", "-o", "on"]

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ docker.build:
115115
docker build -t webserv .
116116

117117
docker.run:
118-
docker run --rm -p 8080:8080 --name webserv webserv:latest
118+
docker run --rm -p 8080:80 --name webserv webserv:latest
119119

120120
lines:
121121
@wc -l $(SRC_DIR)/*.cpp $(INC_DIR)/*.hpp $(SRC_DIR)/*/*.cpp $(INC_DIR)/*/*.hpp | sort

conf/sites-available/default.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
server {
2-
listen 0.0.0.0:8080;
2+
listen 0.0.0.0:80;
33

44
root /var/www/html;
55

0 commit comments

Comments
 (0)