diff options
| author | Zuul <zuul@review.openstack.org> | 2019-02-21 11:02:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-02-21 11:02:31 +0000 |
| commit | efc32ec0f44ab946766ab83b602d4cad4b420236 (patch) | |
| tree | 4e85e7b32d92cb903f5799ecc3a573c8be6783f0 /docker/kube | |
| parent | a445d5085c32bb230df0ba5f1b1b08cb80906cbf (diff) | |
| parent | ab679adcbfaa251b2de00daa0acdbb7771a8ae04 (diff) | |
| download | kolla-efc32ec0f44ab946766ab83b602d4cad4b420236.tar.gz kolla-efc32ec0f44ab946766ab83b602d4cad4b420236.zip | |
Merge "debian/ubuntu: introduce 'debian_arch' variable"
Diffstat (limited to 'docker/kube')
| -rw-r--r-- | docker/kube/kube-base/Dockerfile.j2 | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/docker/kube/kube-base/Dockerfile.j2 b/docker/kube/kube-base/Dockerfile.j2 index d0dc32fa3..02449df2e 100644 --- a/docker/kube/kube-base/Dockerfile.j2 +++ b/docker/kube/kube-base/Dockerfile.j2 @@ -3,16 +3,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ENV KUBERNETES_VERSION=v1.11.1 -{% if base_arch == 'x86_64' %} -ENV KUBE_ARCH=amd64 -{% elif base_arch == 'aarch64' %} -ENV KUBE_ARCH=arm64 -{% else %} -RUN echo 'Kubernetes images not yet available for {{ base_arch }}' \ -&& /bin/false -{% endif %} - -ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/${KUBE_ARCH} +ENV KUBERNETES_DOWNLOAD_ROOT=https://storage.googleapis.com/kubernetes-release/release/${KUBERNETES_VERSION}/bin/linux/{{debian_arch}} {% block kube_base_header %}{% endblock %} |
