diff --git a/part1/exercise_1.1.txt b/part1/Exercise_01/output.txt similarity index 100% rename from part1/exercise_1.1.txt rename to part1/Exercise_01/output.txt diff --git a/part1/Exercise_02/containers.txt b/part1/Exercise_02/containers.txt new file mode 100644 index 0000000..fd3e8a2 --- /dev/null +++ b/part1/Exercise_02/containers.txt @@ -0,0 +1,2 @@ +[devops@devops ~]$ docker ps -a + CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES diff --git a/part1/Exercise_02/images.txt b/part1/Exercise_02/images.txt new file mode 100644 index 0000000..80000ae --- /dev/null +++ b/part1/Exercise_02/images.txt @@ -0,0 +1,2 @@ +[devops@devops ~]$ docker images + REPOSITORY TAG IMAGE ID CREATED SIZE diff --git a/part1/exercise_1.3.txt b/part1/Exercise_03/output.txt similarity index 100% rename from part1/exercise_1.3.txt rename to part1/Exercise_03/output.txt diff --git a/part1/exercise_1.4.txt b/part1/Exercise_04/commands.txt similarity index 100% rename from part1/exercise_1.4.txt rename to part1/Exercise_04/commands.txt diff --git a/part1/exercise_1.5.txt b/part1/Exercise_05/output.txt similarity index 100% rename from part1/exercise_1.5.txt rename to part1/Exercise_05/output.txt diff --git a/part1/exercise_1.6.txt b/part1/Exercise_06/commands.txt similarity index 100% rename from part1/exercise_1.6.txt rename to part1/Exercise_06/commands.txt diff --git a/part1/exercise_1.7.txt b/part1/Exercise_07/Dockerfile similarity index 84% rename from part1/exercise_1.7.txt rename to part1/Exercise_07/Dockerfile index 043c61a..e123d2b 100644 --- a/part1/exercise_1.7.txt +++ b/part1/Exercise_07/Dockerfile @@ -1,5 +1,3 @@ -Dockerfile contents: - FROM ubuntu:20.04 WORKDIR /usr/src/app RUN apt update && apt install -y curl diff --git a/part1/Exercise_07/web-server.sh b/part1/Exercise_07/web-server.sh new file mode 100755 index 0000000..e2feb45 --- /dev/null +++ b/part1/Exercise_07/web-server.sh @@ -0,0 +1,6 @@ +while true +do + echo "Input website:" + read website; echo "Searching.." + sleep 1; curl http://$website +done diff --git a/part1/Exercise_08/Dockerfile b/part1/Exercise_08/Dockerfile new file mode 100644 index 0000000..dfbd3d4 --- /dev/null +++ b/part1/Exercise_08/Dockerfile @@ -0,0 +1,2 @@ +FROM devopsdockeruh/simple-web-service:alpine +CMD server diff --git a/part1/exercise_1.8.txt b/part1/Exercise_08/command.txt similarity index 81% rename from part1/exercise_1.8.txt rename to part1/Exercise_08/command.txt index 4e0eac6..5fd595a 100644 --- a/part1/exercise_1.8.txt +++ b/part1/Exercise_08/command.txt @@ -1,10 +1,3 @@ -Dockerfile contentents: - -FROM devopsdockeruh/simple-web-service:alpine -CMD server - - -Command and output: [devops@devops part1]$ docker run --rm web-server [GIN-debug] [WARNING] Creating an Engine instance with the Logger and Recovery middleware already attached. diff --git a/part1/exercise_1.9.txt b/part1/Exercise_09/command.txt similarity index 89% rename from part1/exercise_1.9.txt rename to part1/Exercise_09/command.txt index cb78adf..ab9c11a 100644 --- a/part1/exercise_1.9.txt +++ b/part1/Exercise_09/command.txt @@ -1,3 +1 @@ -Command used: - [devops@devops part1] touch text.log && docker run -v "$(pwd)/text.log:/usr/src/app/text.log" --rm devopsdockeruh/simple-web-service diff --git a/part1/exercise_1.10.txt b/part1/Exercise_10/output.txt similarity index 100% rename from part1/exercise_1.10.txt rename to part1/Exercise_10/output.txt diff --git a/part1/exercise_1.11.txt b/part1/Exercise_11/Dockerfile similarity index 100% rename from part1/exercise_1.11.txt rename to part1/Exercise_11/Dockerfile diff --git a/part1/exercise_1.12.txt b/part1/Exercise_12/Dockerfile similarity index 100% rename from part1/exercise_1.12.txt rename to part1/Exercise_12/Dockerfile diff --git a/part1/exercise_1.13.txt b/part1/Exercise_13/Dockerfile similarity index 100% rename from part1/exercise_1.13.txt rename to part1/Exercise_13/Dockerfile diff --git a/part1/Exercise_13/command.txt b/part1/Exercise_13/command.txt new file mode 100644 index 0000000..096c7ef --- /dev/null +++ b/part1/Exercise_13/command.txt @@ -0,0 +1 @@ +docker run --rm -it -p 8080:8080 example-backend:1.13 diff --git a/part1/Exercise_14/Dockerfile_back b/part1/Exercise_14/Dockerfile_back new file mode 100644 index 0000000..33ff8db --- /dev/null +++ b/part1/Exercise_14/Dockerfile_back @@ -0,0 +1,7 @@ +FROM golang:1.16 +EXPOSE 8080 +WORKDIR /usr/src/app +COPY . . +ENV REQUEST_ORIGIN=http://devops:5000 +RUN go build +CMD ["./server"] diff --git a/part1/Exercise_14/Dockerfile_front b/part1/Exercise_14/Dockerfile_front new file mode 100644 index 0000000..1937c6e --- /dev/null +++ b/part1/Exercise_14/Dockerfile_front @@ -0,0 +1,9 @@ +FROM node:16.19 +EXPOSE 5000 +WORKDIR /usr/src/app +COPY package*.json ./ +COPY . . +ENV REACT_APP_BACKEND_URL=http://devops:8080 +RUN npm install && npm run build +RUN npm install -g serve +CMD ["serve", "-s", "-l", "5000", "build"] diff --git a/part1/Exercise_14/commands.txt b/part1/Exercise_14/commands.txt new file mode 100644 index 0000000..fb98f2a --- /dev/null +++ b/part1/Exercise_14/commands.txt @@ -0,0 +1,2 @@ +docker run --rm -it -p 5000:5000 example-frontend:1.14 +docker run --rm -it -p 8080:8080 example-backend:1.14 diff --git a/part1/exercise_1.15.txt b/part1/Exercise_15/submission.txt similarity index 100% rename from part1/exercise_1.15.txt rename to part1/Exercise_15/submission.txt diff --git a/part1/exercise_1.14.txt b/part1/exercise_1.14.txt deleted file mode 100644 index c1c4d58..0000000 --- a/part1/exercise_1.14.txt +++ /dev/null @@ -1,24 +0,0 @@ -Commands used: -docker run --rm -it -p 5000:5000 example-frontend:1.14 -docker run --rm -it -p 8080:8080 example-backend:1.14 - -Dockerfile for frontend: -FROM node:16.19 -EXPOSE 5000 -WORKDIR /usr/src/app -COPY package*.json ./ -COPY . . -ENV REACT_APP_BACKEND_URL=http://devops:8080 -RUN npm install && npm run build -RUN npm install -g serve -CMD ["serve", "-s", "-l", "5000", "build"] - - -Dockerfile for backend: -FROM golang:1.16 -EXPOSE 8080 -WORKDIR /usr/src/app -COPY . . -ENV REQUEST_ORIGIN=http://devops:5000 -RUN go build -CMD ["./server"] diff --git a/part1/exercise_1.2.txt b/part1/exercise_1.2.txt deleted file mode 100644 index 53decfb..0000000 --- a/part1/exercise_1.2.txt +++ /dev/null @@ -1,9 +0,0 @@ -Script started on 2023-03-13 12:37:49+02:00 [TERM="rxvt-unicode-256color" TTY="/dev/pts/1" COLUMNS="212" LINES="69"] -[devops@devops ~]$ docker ps -a - CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES -[devops@devops ~]$ docker images - REPOSITORY TAG IMAGE ID CREATED SIZE -[devops@devops ~]$ exit -exit - -Script done on 2023-03-13 12:38:14+02:00 [COMMAND_EXIT_CODE="130"]