fixed cron docker

ibm-avocados · May 29, 2020 · 75591e2 · 75591e2
1 parent 0e3b5a7
commit 75591e2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/config/cron-deployment.yaml b/config/cron-deployment.yaml
@@ -21,7 +21,7 @@ spec:
         run:  cron
     spec:
       containers:
-      - image:  moficodes/ibmcloud-kubernetes-cron:v0.2.5
+      - image:  moficodes/ibmcloud-kubernetes-cron:v0.2.6
         imagePullPolicy: Always
         name:  cron
         env:

diff --git a/docker/Dockerfile.cron b/docker/Dockerfile.cron
@@ -5,7 +5,7 @@ FROM ubuntu:xenial as builder
 #     echo 'nobody:x:65534:' > /user/group
 
 RUN apt-get update && apt-get upgrade -y
-RUN apt-get install -y git curl wget ca-certificates
+RUN apt-get install -y  curl wget git ca-certificates
 RUN wget https://dl.google.com/go/go1.13.3.linux-amd64.tar.gz && \
   tar -xvf go1.13.3.linux-amd64.tar.gz && \ 
   mv go /usr/local
@@ -31,12 +31,13 @@ RUN CGO_ENABLED=0 /usr/local/go/bin/go build \
 FROM ubuntu:xenial
 
 COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ca-certificates.crtca
-COPY --from=builder /usr/bin/git /usr/bin/git
 COPY --from=builder /usr/local/bin/ibmcloud /usr/local/bin/ibmcloud
 COPY --from=builder /app /app
 
 COPY templates/ templates/
 
+RUN /usr/local/bin/ibmcloud cf install
+RUN apt-get update && apt-get install -y libcurl4-openssl-dev git 
 # Run the compiled binary.
 ENTRYPOINT ["/app"]
 
diff --git a/templates/email.gohtml b/templates/email.gohtml
@@ -12,7 +12,7 @@
     <p>Public Vlan : {{.Schedule.CreateRequest.ClusterRequest.PublicVlan}} </p>
     <p>Private Vlan : {{.Schedule.CreateRequest.ClusterRequest.PrivateVlan}} </p>
     <p>Machine Type : {{.Schedule.CreateRequest.ClusterRequest.MachineType}}</p>
-    <p>Worker Count : {{.Schedule.CreateRequest.ClusterRequest.WorkerCount}}</p>
+    <p>Worker Count : {{.Schedule.CreateRequest.ClusterRequest.WorkerNum}}</p>
     {{ if .Errors }}
       <ol>
         {{range .Errors}}