Switching to apache-php demoapp version

def953f8 · Andres Toomsalu · e8f6b04a · def953f8 · def953f8 · e8f6b04a
Commit def953f8 authored Jun 06, 2015 by Andres Toomsalu
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,20 +5,15 @@ MAINTAINER      OpenNode LLC <info@opennodecloud.com>
 RUN yum install -y http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm

 # install pre-requisites
-RUN yum install -y npm net-tools
+RUN yum install -y httpd php php-mysql net-tools
+RUN mkdir -p /var/www/html

 # add health check script
 ADD nf-demo-app-check /usr/bin/nf-demo-app-check

-# make the nodejs src folder available in the docker image
-ADD nodejs/ /srv/nodejs
-WORKDIR /srv/nodejs
-
-# install the dependencies from the package.json file
-RUN npm install
-
 # make port 80 available outside of the image
 EXPOSE 80

 # start node with the index.js file of our hello-world application
-CMD ["node", "index.js"]
+ENTRYPOINT ["/usr/sbin/httpd"] 
+CMD ["-D", "FOREGROUND"]
--- a/nodefabric/nf-demo-app.service
+++ b/nodefabric/nf-demo-app.service
@@ -16,7 +16,7 @@ docker run --name=$DEMOAPP_INSTANCE -h $HOSTNAME \
             -p $DEMOAPP_BIND_ADDR:8010:80 \
 	     -e SERVICE_80_CHECK_CMD=/usr/bin/nf-demo-app-check \
             -e DEMOAPP_HELLOWORLD=\"$DEMOAPP_HELLOWORLD\" \
-             -v $DEMOAPP_DATADIR:/var/lib/nf-demo-app \
+             -v $DEMOAPP_DATADIR:/var/www/html \
             $DEMOAPP_IMAGE"
 ExecStop=-/usr/bin/docker stop $DEMOAPP_INSTANCE


--- a/nodejs/index.js
+++ b/nodejs/index.js
-
-var express = require('express');
-var os = require("os");
-
-var app = express();
-var hostname = os.hostname();
-
-app.get('/', function (req, res) {
-  res.send('<html><body>Hello from Node.js container ' + hostname + '</body></html>');
-});
-
-app.listen(80);
-console.log('Running on http://localhost');
--- a/nodejs/package.json
+++ b/nodejs/package.json
-{
-  "name": "nodefabric-hello-world",
-  "private": true,
-  "version": "0.0.1",
-  "description": "Node.js Hello world app on NodeFabric",
-  "author": "opennodecloud.com",
-  "dependencies": {
-    "express": "4.12.0"
-  }
-}