Merge pull request #1 from mdelder/mdelder-update-for-icp

Rebase Dockerfile on alpine & clean up entrypoint script

Dockerfile

@@ -1,18 +1,25 @@
-FROM node
+FROM node:boron-alpine
 EXPOSE 3000
 
-RUN apt-get update && \
-    apt-get -y install jq && \
-    apt-get clean
+RUN apk --update --no-cache add jq curl tar
+
+LABEL org.label-schema.vendor="IBM" \
+      org.label-schema.name="$IMAGE_NAME" \
+      org.label-schema.description="$IMAGE_DESCRIPTION" \
+      org.label-schema.vcs-ref=$VCS_REF \
+      org.label-schema.vcs-url=$VCS_URL \
+      org.label-schema.license="Licensed Materials - Property of IBM" \
+      org.label-schema.schema-version="1.0"
 
 RUN mkdir -p /usr/src/app
 WORKDIR /usr/src/app
 
 RUN curl -L  https://github.com/watson-developer-cloud/conversation-simple/archive/master.tar.gz --output /tmp/master.tar.gz && \
     tar -xzvf /tmp/master.tar.gz -C /usr/src/app --strip-components 1
 
-RUN npm install --production && npm cache clean
+RUN npm install --production
 
-COPY *.sh /usr/src/app
+COPY entrypoint.sh /usr/src/app
+RUN chmod +x /usr/src/app/entrypoint.sh
 
-CMD [ "/usr/src/app/run-server.sh"]
+CMD [ "/usr/src/app/entrypoint.sh"]

run-server.sh → entrypoint.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
+
 export CONVERSATION_PASSWORD=$(echo "$CONVERSATION_SERVICE_CAR" | jq -r '.password')
 export CONVERSATION_USERNAME=$(echo "$CONVERSATION_SERVICE_CAR" | jq -r '.username')
-echo "CONVERSATION_USERNAME == $CONVERSATION_USERNAME"
-echo "CONVERSATION_PASSWORD == $CONVERSATION_PASSWORD"
-npm start
+echo "npm start"
+/usr/local/bin/npm start

car-dashboard-pod.yml → watson-conversation.yml

@@ -3,34 +3,34 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: bot-son
+  name: watson-conversation-app
   labels:
-    app: bot-son
+    app: watson-conversation-app
     tier: frontend
 spec:
   type: NodePort
   ports:
   - port: 3000
   selector:
-    app: bot-son
+    app: watson-conversation-app
     tier: frontend
 ---
 # Application to deploy
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: bot-son
+  name: watson-conversation-app
 spec:
   replicas: 2 # tells deployment to run 2 pods matching the template
   template: # create pods using pod definition in this template
     metadata:
       labels:
-        app: bot-son
+        app: watson-conversation-app
         tier: frontend
     spec:
       containers:
-      - name: bot-son
-        image: jcantosz/watson
+      - name: watson-conversation-app
+        image: mycluster.icp:8500/default/conversation-simple:latest
         resources:
           requests:
             cpu: 100m