openstack/openstack-helm-infra
Code Issues Proposed changes

KubeADM-AIO: Move to upstream debian base image

Browse Source 
This PS moves KubeADM-AIO to use the upstream debian base image
that is used to build the Kubernetes release images:
 * https://github.com/kubernetes/kubernetes/tree/master/build/debian-base

Change-Id: I153a3aee43613b429793c179b2707c916821d39a
This commit is contained in:
portdirect 2018-01-13 23:29:10 -05:00
parent 217385a0dd
commit 76d0f57e64
1 changed files with 3 additions and 2 deletions

5
tools/images/kubeadm-aio/Dockerfile

@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
#https://github.com/kubernetes/ingress-nginx/tree/master/images/ubuntu-slim #https://github.com/kubernetes/kubernetes/tree/master/build/debian-base
FROM gcr.io/google_containers/ubuntu-slim:0.14 FROM gcr.io/google-containers/debian-base-amd64:0.3
MAINTAINER pete.birley@att.com MAINTAINER pete.birley@att.com
ARG KUBE_VERSION="v1.8.3" ARG KUBE_VERSION="v1.8.3"
@ -36,6 +36,7 @@ RUN set -ex ;\
apt-get update ;\ apt-get update ;\
apt-get upgrade -y ;\ apt-get upgrade -y ;\
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
bash \
ca-certificates \ ca-certificates \
curl \ curl \
jq \ jq \