update

DaoCloud · Dec 16, 2021 · 2ad11f0 · 2ad11f0
1 parent 19c3a21
commit 2ad11f0
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -9,4 +9,4 @@ COPY . /usr/share/nginx/html
 EXPOSE 80
 
 # Start Nginx and keep it running background and start php
-CMD sed -i "s/ContainerID: /ContainerID: "$(hostname)"/g" /usr/share/nginx/html/index.html && nginx -g "daemon off;"
+CMD bash scripts/start.sh
diff --git a/Makefile b/Makefile
@@ -39,7 +39,6 @@ TARGETS?=linux/arm,linux/arm64,linux/amd64
 GITHUB_TOKEN?=
 
 build-container: 
-	@git describe --tags --dirty
 	@docker build --build-arg BASEIMAGE=$(BASEIMAGE) -t "$(IMAGE)" --file ./Dockerfile .
 # docker build -t $(IMAGE) --build-arg BASEIMAGE=$(BASEIMAGE) --build-arg LOGCOUNTER=$(LOGCOUNTER) .
 

diff --git a/charts/templates/deployment.yaml b/charts/templates/deployment.yaml
@@ -56,3 +56,16 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      env:
+        - name: NODE_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: spec.nodeName
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
diff --git a/index.html b/index.html
@@ -18,7 +18,6 @@
 </head>
 <body>
   <div class="container">
-    <p style="position:absolute;left:60px;top:100px;">ContainerID: </p>
     <div class="heading">
       <h1 class="title">2048</h1>
       <div class="scores-container">
@@ -72,7 +71,9 @@ <h1 class="title">2048</h1>
 
       </div>
     </div>
-
+    <div id="podinfo" class="game-explanation">
+      PODINFO
+    <hr>
     <p class="game-explanation">
       <strong class="important">How to play:</strong> Use your <strong>arrow keys</strong> to move the tiles. When two tiles with the same number touch, they <strong>merge into one!</strong>
     </p>

diff --git a/scripts/start.sh b/scripts/start.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+PODINFO=""
+
+PODINFO+="<p><strong class=\"important\">HOST_NAME:</strong> $(hostname) </strong></p>"
+if [ -n $NODE_NAME ]
+then
+PODINFO+="<p><strong class=\"important\">NODE_NAME:</strong> $NODE_NAME </strong></p>"
+fi
+if [ -n $POD_NAME ]
+then
+PODINFO+="<p><strong class=\"important\">POD_NAME:</strong> $POD_NAME </strong></p>"
+fi
+if [ -n $POD_NAMESPACE ]
+then
+PODINFO+="<p><strong class=\"important\">POD_NAMESPACE:</strong> $POD_NAMESPACE </strong></p>"
+fi
+echo sed -i "s+PODINFO+\'$PODINFO\'+g" /usr/share/nginx/html/index.html
+nginx -g "daemon off;"