From 17c2beb62635355b41799862ae76e8b7c17375d1 Mon Sep 17 00:00:00 2001 From: Ahmed Sabbour <103856+sabbour@users.noreply.github.com> Date: Fri, 4 Oct 2019 15:30:06 -0700 Subject: [PATCH 1/2] Update 03-07 networking.md --- _entries/03-07 networking.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_entries/03-07 networking.md b/_entries/03-07 networking.md index eb0bcc6..f5182f2 100755 --- a/_entries/03-07 networking.md +++ b/_entries/03-07 networking.md @@ -11,7 +11,7 @@ Let's review how this application is set up... ![OSToy Diagram](/media/managedlab/4-ostoy-arch.png) -As can be seen in the image above we see we have defined at least 2 separate pods, each with its own service. One is the frontend web application (with a service and a publicly accessible route) and the other is the backend microservice with a service object created so that the frontend pod can communicate with the microservice (accross the pods if more than one). Therefore this microservice is not accessible from outside this cluster, nor from other namespaces/projects (due to ARO's network policy, **ovs-subnet**). The sole purpose of this microservice is to serve internal web requests and return a JSON object containing the current hostname and a randomly generated color string. This color string is used to display a box with that color displayed in the tile (titled "Intra-cluster Communication"). +As can be seen in the image above we see we have defined at least 2 separate pods, each with its own service. One is the frontend web application (with a service and a publicly accessible route) and the other is the backend microservice with a service object created so that the frontend pod can communicate with the microservice (accross the pods if more than one). Therefore this microservice is not accessible from outside this cluster, nor from other namespaces/projects (due to ARO's network policy, **ovs-networkpolicy**). The sole purpose of this microservice is to serve internal web requests and return a JSON object containing the current hostname and a randomly generated color string. This color string is used to display a box with that color displayed in the tile (titled "Intra-cluster Communication"). ### Networking From 79e47e67bb2a6dd97069dad3239fe42ffb7c60b1 Mon Sep 17 00:00:00 2001 From: Ahmed Sabbour <103856+sabbour@users.noreply.github.com> Date: Tue, 8 Oct 2019 13:11:03 -0700 Subject: [PATCH 2/2] Update Dockerfile Closes #42 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 000b36a..5d453fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ WORKDIR /src/app COPY . . # Install app dependencies and build static files -RUN mkdir _site && \ +RUN mkdir _site && mkdir .jekyll-cache && \ jekyll build --future # @@ -20,4 +20,4 @@ FROM nginx:1.15-alpine WORKDIR /usr/share/nginx/html COPY --from=build /src/app/_site . -EXPOSE 80 \ No newline at end of file +EXPOSE 80