Updated yelb-ui startup.sh to expect http:<endpoint>:4567 as input for $YELB_APPSERVER_ENDPOINT - container image elevated to 0.11

Author: mreferre

deployments/localtest/README.md

@@ -9,7 +9,7 @@ docker network create yelb-network
 docker run --name redis-server -p 6379:6379 --network=yelb-network -d redis:4.0.2
 docker run --name yelb-db -p 5432:5432 --network=yelb-network -d mreferre/yelb-db:0.6
 docker run --name yelb-appserver --network=yelb-network -d -p 4567:4567 -e RACK_ENV=test mreferre/yelb-appserver:0.6
-docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.9
+docker run --name yelb-ui --network=yelb-network -d -p 8080:80 -e UI_ENV=test mreferre/yelb-ui:0.10
 ```
 You should now be able to see the application running by connecting your browser to: http://localhost:8080
 

deployments/localtest/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: "2.1"
 services:
   yelb-ui:
-    image: mreferre/yelb-ui:0.9
+    image: mreferre/yelb-ui:0.10
     depends_on:
       - yelb-appserver
     ports:

deployments/platformdeployment/AWS/ECS/cdk/lib/yelb-ecs-stack.ts

@@ -27,7 +27,7 @@ export class YelbEcsStack extends cdk.Stack {
     });
 
     const yelbuicontainer = yelbuitaskdef.addContainer("yelb-ui-container", {
-      image: ecs.ContainerImage.fromRegistry("mreferre/yelb-ui:0.9"),
+      image: ecs.ContainerImage.fromRegistry("mreferre/yelb-ui:0.10"),
       environment: {"SEARCH_DOMAIN": yelbnamespace.namespaceName}
     })
 

deployments/platformdeployment/AWS/ECS/cfn/yelb-cloudformation-ECS-deployment.yaml

@@ -197,7 +197,7 @@ Resources:
             ContainerDefinitions:
                 - Name: yelb-ui
                   Essential: true
-                  Image: mreferre/yelb-ui:0.9
+                  Image: mreferre/yelb-ui:0.10
                   Environment: 
                     - Name: SEARCH_DOMAIN
                       Value: !Ref 'Domain' 

deployments/platformdeployment/Docker/docker-compose.yaml

@@ -2,7 +2,7 @@
 version: "3.0"
 services:
   yelb-ui:
-    image: mreferre/yelb-ui:0.9
+    image: mreferre/yelb-ui:0.10
     depends_on:
       - yelb-appserver
     ports:

deployments/platformdeployment/Docker/stack-deploy.yaml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   yelb-ui:
-    image: 'mreferre/yelb-ui:0.9'
+    image: 'mreferre/yelb-ui:0.10'
     depends_on:
       - yelb-appserver
     ports:

deployments/platformdeployment/Kubernetes/cdk8s/main.ts

@@ -34,7 +34,7 @@ export class YelbCdk8s extends Chart {
             containers: [
               {
                 name: 'yelb-ui-container',
-                image: 'mreferre/yelb-ui:0.9',
+                image: 'mreferre/yelb-ui:0.10',
                 ports: [ { containerPort: 80 } ]
               }
             ]

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-ingress-alb-ip.yaml

@@ -93,7 +93,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-ingress-alb.yaml

@@ -92,7 +92,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-loadbalancer.yaml

@@ -75,7 +75,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-minikube-hostport.yaml

@@ -61,7 +61,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
           hostPort: 32777 # depending on the minikube driver you use you may be able to even use 80. But something above 32000 seems safer 

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-minikube-ingress.yaml

@@ -87,7 +87,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/pre-k8s-1.16/yelb-k8s-minikube-nodeport.yaml

@@ -76,7 +76,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-ingress-alb-ip.yaml

@@ -97,7 +97,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-ingress-alb.yaml

@@ -96,7 +96,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-loadbalancer.yaml

@@ -79,7 +79,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image:  mreferre/yelb-ui:0.9
+        image:  mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-minikube-hostport.yaml

@@ -65,7 +65,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
           hostPort: 32777 # depending on the minikube driver you use you may be able to even use 80. But something above 32000 seems safer 

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-minikube-ingress.yaml

@@ -94,7 +94,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

deployments/platformdeployment/Kubernetes/yaml/yelb-k8s-minikube-nodeport.yaml

@@ -80,7 +80,7 @@ spec:
     spec:
       containers:
       - name: yelb-ui
-        image: mreferre/yelb-ui:0.9
+        image: mreferre/yelb-ui:0.10
         ports:
         - containerPort: 80
 ---

yelb-ui/README.md

@@ -2,11 +2,11 @@ This is the user interface module. It's an Angular2 application that uses the VM
 
 The way this works may be a bit cumbersome. I basically clone the Clarity seed, I check out a specific commit (one that I have tested) and then copy/replace the files that are in the directory `clarity-seed-newfiles`. These files are both code and configuration of my app. You can look at the mechanics of how this happens either in the `Dockerfile` in this directory or in the `yelb-ui.sh` script in the `deployments/platformdeployment/Linux` directory. 
 
-Depending on the deployment model being used the compile of the Angular2 application happens at different times. 
+Depending on the deployment model being used, the compiling of the Angular2 application happens at different times. 
 
 For the EC2 deployment model, the UI gets compiled at deployment time via running the setup via cloud-init scripts. This is why the app may take a while to become available even though the CFN stack says it's all green and good. The instance where the UI is deployed takes about 5 minutes (or more depending on the instance type) to compile everything and start vending the javascript code. 
 
 For the container deployment model, the UI gets compiled at container image build time. This actually uses a two phase build where the resulting javascript code is copied into a brand new image based off of the `nginx` official image. Check out the Dockerfile to see how that works. 
 
-For the serverless deployment model the UI gets compiled once and pushed to an S3 bucket. This (public) bucket is then used as a source for deploying a new bucket that vends the code to the browser that makes the request. This requires an additional tweak because by default the application is configured to use the IP/FQDN of the UI web server to make the application API calls. This works fine for the EC2 and container deployments because the nginx will act as a proxy but in this case the UI needs to be pre-configured with the end-point of the API Gateway that makes available the API calls (which in turns call the Lambdas). Check out the serverless deployment model for more details on how that tweak works. 
+For the serverless Lambda deployment model the UI gets compiled once and pushed to an S3 bucket. This (public) bucket is then used as a source for deploying a new bucket that vends the code to the browser that makes the request. This requires an additional tweak because by default the application is configured to use the IP/FQDN of the UI web server to make the application API calls. This works fine for the EC2 and container deployments because the nginx will act as a proxy but in this case the UI needs to be pre-configured with the end-point of the API Gateway that makes available the API calls (which in turns call the Lambdas). Check out the serverless deployment model for more details on how that tweak works. 
 

yelb-ui/startup.sh

@@ -2,22 +2,22 @@
 NGINX_CONF=/etc/nginx/conf.d/default.conf
 cd clarity-seed
 
-if [ -z "$YELB_APPSERVER_ENDPOINT" ]; then YELB_APPSERVER_ENDPOINT="yelb-appserver"; fi 
+if [ -z "$YELB_APPSERVER_ENDPOINT" ]; then YELB_APPSERVER_ENDPOINT="http://yelb-appserver:4567"; fi
 
 # when the variable is populated a search domain entry is added to resolv.conf at startup
 # this is needed for the ECS service discovery given the app works by calling host names and not FQDNs
-# a search domain can't be added to the container when using the awsvpc mode 
-# and the awsvpc mode is needed for A records (bridge only supports SRV records) 
-if [ $SEARCH_DOMAIN ]; then echo "search ${SEARCH_DOMAIN}" >> /etc/resolv.conf; fi 
+# a search domain can't be added to the container when using the awsvpc mode
+# and the awsvpc mode is needed for A records (bridge only supports SRV records)
+if [ $SEARCH_DOMAIN ]; then echo "search ${SEARCH_DOMAIN}" >> /etc/resolv.conf; fi
 
 sed -i -- 's#/usr/share/nginx/html#/clarity-seed/'$UI_ENV'/dist#g' $NGINX_CONF
 
-# this adds the reverse proxy configuration to nginx 
-# everything that hits /api is proxied to the app server     
+# this adds the reverse proxy configuration to nginx
+# everything that hits /api is proxied to the app server
 if ! grep -q "location /api" "$NGINX_CONF"; then
     eval "cat <<EOF
     location /api {
-        proxy_pass http://"$YELB_APPSERVER_ENDPOINT":4567/api;
+        proxy_pass "$YELB_APPSERVER_ENDPOINT"/api;
         proxy_http_version 1.1;
     }
     gzip on;
@@ -29,6 +29,5 @@ EOF
     sed --in-place '/server_name  localhost;/ r /proxycfg.txt' $NGINX_CONF
 fi
 
-nginx -g "daemon off;" 
-
+nginx -g "daemon off;"