diff --git a/Dockerfile b/Dockerfile index 88376ee..d85bd2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,2 @@ FROM httpd:2.4 -COPY ./public_html/ /usr/local/apache2/htdocs/ COPY ./my-httpd.conf /usr/local/apache2/conf/httpd.conf diff --git a/Makefile b/Makefile deleted file mode 100644 index 13ea802..0000000 --- a/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -all: - @make stop - @make build - @make start - -build: - docker build -t apache2 . - -start: build - docker run -dit --rm \ - --name webserver \ - -p 8080:80 \ - -v $(shell pwd)/public_html:/usr/local/apache2/htdocs \ - apache2 - -stop: - @docker stop webserver || echo "No running container, run \`make start\` to start webserver. \n" - -.PHONY: all build start stop diff --git a/README.md b/README.md index 1901d99..876d157 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Plain Apache Server ## Instructions -`make` and visit localhost:8080 +`docker-compose up -d` and visit localhost:8080 ## Required Docker