From d0101df34803d6266c8ae3be2be3befd79e459de Mon Sep 17 00:00:00 2001 From: Dmitry Puzikov Date: Thu, 25 Apr 2019 14:33:48 +0200 Subject: Minimize container image Rebase image on alpine Change-Id: I923c0792783b551bf623f754a2aed4bf1a765f45 Issue-ID: INT-1045 Signed-off-by: Dmitry Puzikov --- kubernetes/readiness/docker/init/Dockerfile | 10 +++------- kubernetes/readiness/docker/init/job_complete.py | 2 +- kubernetes/readiness/docker/init/ready.py | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/kubernetes/readiness/docker/init/Dockerfile b/kubernetes/readiness/docker/init/Dockerfile index 7214e04174..b060915354 100644 --- a/kubernetes/readiness/docker/init/Dockerfile +++ b/kubernetes/readiness/docker/init/Dockerfile @@ -1,17 +1,12 @@ -from ubuntu:16.04 +FROM python:2-alpine ENV no_proxy "localhost,127.0.0.1,.cluster.local,$KUBERNETES_SERVICE_HOST" # Setup Corporate proxy ENV https_proxy ${HTTPS_PROXY} ENV http_proxy ${HTTP_PROXY} -# Additional packages -RUN apt-get update -RUN apt-get install -y apt-utils git wget curl dnsutils python python-pip jq net-tools coreutils vim - RUN pip install requests pyyaml kubernetes - ENV CERT="/var/run/secrets/kubernetes.io/serviceaccount/ca.crt" ENV TOKEN="/var/run/secrets/kubernetes.io/serviceaccount/token" @@ -21,4 +16,5 @@ RUN chmod a+x /root/ready.py COPY job_complete.py /root/job_complete.py RUN chmod a+x /root/job_complete.py -ENTRYPOINT /root/ready.py +ENTRYPOINT ["/root/ready.py"] +CMD [""] \ No newline at end of file diff --git a/kubernetes/readiness/docker/init/job_complete.py b/kubernetes/readiness/docker/init/job_complete.py index 97d22da6c1..2b3180aa2e 100644 --- a/kubernetes/readiness/docker/init/job_complete.py +++ b/kubernetes/readiness/docker/init/job_complete.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import getopt import logging import os diff --git a/kubernetes/readiness/docker/init/ready.py b/kubernetes/readiness/docker/init/ready.py index 87c09a444c..20872f9897 100644 --- a/kubernetes/readiness/docker/init/ready.py +++ b/kubernetes/readiness/docker/init/ready.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python import getopt import logging import os -- cgit 1.2.3-korg