diff --git a/compose.yml b/compose.yml index a3fd0bf..63e189f 100644 --- a/compose.yml +++ b/compose.yml @@ -1,13 +1,11 @@ services: webserver: - dockerfile: docker/apache2/dockerfile build: . ports: - "5000:5000" volumes: - .:/code attacker: - dockerfile: docker/attacker/dockerfile build: . ports: - "5001:5001" diff --git a/docker/apache2/dockerfile b/docker/apache2/dockerfile deleted file mode 100644 index 268db58..0000000 --- a/docker/apache2/dockerfile +++ /dev/null @@ -1,8 +0,0 @@ -FROM ubuntu:lastest AS webserver -RUN apt-get update && apt-get install -y apache2 - -WORKDIR /var/www/html -COPY ./public/ . - - -CMD ["apache2ctl", "-D", "FOREGROUND"] \ No newline at end of file diff --git a/docker/attacker/dockerfile b/docker/attacker/dockerfile deleted file mode 100644 index 0e4c195..0000000 --- a/docker/attacker/dockerfile +++ /dev/null @@ -1,4 +0,0 @@ -FROM alpine:latest AS attacker -RUN apk add --no-cache curl - -CMD ["curl", "webserver:80"] \ No newline at end of file diff --git a/dockerfile b/dockerfile new file mode 100644 index 0000000..8865281 --- /dev/null +++ b/dockerfile @@ -0,0 +1,12 @@ +FROM ubuntu:lastest AS webserver +RUN apt-get update && apt-get install -y apache2 + +WORKDIR /var/www/html +COPY ./public/ . + +CMD ["apache2ctl", "-D", "FOREGROUND"] + +FROM alpine:latest AS attacker +RUN apk add --no-cache curl + +CMD ["curl", "webserver:80"] \ No newline at end of file