remove php && use sed

DaoCloud · Sep 19, 2016 · efadbf4 · efadbf4
1 parent 7f60b32
commit efadbf4
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # Using a compact OS
-FROM php:5-zts-alpine
+FROM alpine:latest
 
 MAINTAINER Golfen Guo <golfen.guo@daocloud.io>
 
@@ -15,4 +15,4 @@ COPY . /usr/share/nginx/html
 EXPOSE 80
 
 # Start Nginx and keep it running background and start php
-CMD nginx -g "pid /tmp/nginx.pid; daemon on;" && php -S 0.0.0.0:8888 /usr/share/nginx/html/hostname.php
+CMD sed -i "s/ContainerID: /ContainerID: "$(hostname)"/g" /usr/share/nginx/html/index.html && nginx -g "pid /tmp/nginx.pid; daemon off;"
diff --git a/hostname.php b/hostname.php
diff --git a/index.html b/index.html
@@ -18,6 +18,7 @@
 </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">

diff --git a/js/application.js b/js/application.js
@@ -2,20 +2,3 @@
 window.requestAnimationFrame(function () {
   new GameManager(4, KeyboardInputManager, HTMLActuator, LocalStorageManager);
 });
-
-function httpGet(url) {
-    var xmlHttp = new XMLHttpRequest();
-    xmlHttp.open("GET", url, false);
-    xmlHttp.send(null);
-    return xmlHttp.responseText;
-}
-
-function setContainerID() {
-    var hostname = httpGet("http://" + window.location.hostname + ":8888");
-    var container = document.getElementsByClassName("container")[0];
-    var tmp = document.createElement('div');
-    tmp.innerHTML = '<p  style="position:absolute;left:60px;top:100px;">ContainerID: ' + hostname + "</p>";
-    container.insertBefore(tmp, container.children[0]);
-}
-
-setContainerID();