Skip to content

Commit 52c5d8b

Browse files
Security patch: update base alpine image (#33)
* Apply security fixes: update base alpine image * timeout binary -t flag deprecated fix
1 parent e5a3c9d commit 52c5d8b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ RUN curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/rel
1212
RUN curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/amd64/kubectl
1313

1414

15-
FROM alpine:3.6
15+
FROM alpine:3.10
1616

1717
RUN apk add --update bash
1818

cf-deploy-kubernetes.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,6 @@ kubectl --context "${KUBECONTEXT}" --namespace "${KUBERNETES_NAMESPACE}" $KUBECT
117117

118118
if [ -n "$DEPLOYMENT_NAME" ]; then
119119
echo "---> Waiting for a successful deployment/${DEPLOYMENT_NAME} status to namespace ${KUBERNETES_NAMESPACE} ..."
120-
timeout -s SIGTERM -t $KUBERNETES_DEPLOYMENT_TIMEOUT kubectl --context "${KUBECONTEXT}" --namespace "${KUBERNETES_NAMESPACE}" rollout status deployment/"${DEPLOYMENT_NAME}" || fatal "Deployment Failed"
120+
timeout -s SIGTERM $KUBERNETES_DEPLOYMENT_TIMEOUT kubectl --context "${KUBECONTEXT}" --namespace "${KUBERNETES_NAMESPACE}" rollout status deployment/"${DEPLOYMENT_NAME}" || fatal "Deployment Failed"
121121
fi
122122

0 commit comments

Comments
 (0)