adding 'curl' to base msa-api image

Fixing readiness/liveness probes on msa-api (the app itself has no retries to redis....)
shelleg · Oct 11, 2018 · e790152 · e790152
1 parent 2368d02
commit e790152
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 23 deletions.
diff --git a/charts/msa-api/values.yaml b/charts/msa-api/values.yaml
@@ -6,7 +6,7 @@ replicaCount: 1
 
 image:
   repository: shelleg/msa-api
-  tag: 0.1.2
+  tag: 0.1.3
   pullPolicy: Always
 
 nameOverride: "msa-api"

diff --git a/charts/msa-pinger/templates/deployment.yaml b/charts/msa-pinger/templates/deployment.yaml
@@ -37,13 +37,3 @@ spec:
             timeoutSeconds: {{ .Values.livinessProbe.timeoutSeconds }}
             periodSeconds: {{ .Values.livinessProbe.periodSeconds }}
             failureThreshold: {{ .Values.livinessProbe.failureThreshold }}
-          # readinessProbe:
-          #   httpGet:
-          #     host: {{ .Release.Name }}-msa-api
-          #     path: /isAlive
-          #     port: 8080
-          #     scheme: HTTP
-          #   initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          #   timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          #   periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          #   failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
diff --git a/charts/msa-poller/templates/deployment.yaml b/charts/msa-poller/templates/deployment.yaml
@@ -37,13 +37,3 @@ spec:
             timeoutSeconds: {{ .Values.livinessProbe.timeoutSeconds }}
             periodSeconds: {{ .Values.livinessProbe.periodSeconds }}
             failureThreshold: {{ .Values.livinessProbe.failureThreshold }}
-          # readinessProbe:
-          #   httpGet:
-          #     host: {{ .Release.Name }}-msa-api
-          #     path: /isAlive
-          #     port: 8080
-          #     scheme: HTTP
-          #   initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }}
-          #   timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }}
-          #   periodSeconds: {{ .Values.readinessProbe.periodSeconds }}
-          #   failureThreshold: {{ .Values.readinessProbe.failureThreshold }}
diff --git a/msa-api/Dockerfile b/msa-api/Dockerfile
@@ -1,4 +1,4 @@
-FROM shelleg/node-base-img:0.1.1
+FROM shelleg/node-base-img:0.1.2
 
 RUN mkdir -p /opt/tikal/config
 

diff --git a/msa-api/Dockerfile-base b/msa-api/Dockerfile-base
@@ -1,4 +1,5 @@
 FROM node:6-alpine
 
 COPY package.json .
-RUN npm install
+RUN apk add --no-cache curl && \
+    npm install