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/prometheus/prometheus-base | |
| 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/prometheus/prometheus-base')
| -rw-r--r-- | docker/prometheus/prometheus-base/Dockerfile.j2 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/docker/prometheus/prometheus-base/Dockerfile.j2 b/docker/prometheus/prometheus-base/Dockerfile.j2 index 93da38239..8bb86e227 100644 --- a/docker/prometheus/prometheus-base/Dockerfile.j2 +++ b/docker/prometheus/prometheus-base/Dockerfile.j2 @@ -7,14 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='prometheus') }} -{% if base_arch == 'x86_64' %} -ENV prometheus_arch=amd64 -{% elif base_arch == 'aarch64' %} -ENV prometheus_arch=arm64 -{% else %} -ENV prometheus_arch={{ base_arch }} -{% endif %} - COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN chmod 755 /usr/local/bin/kolla_extend_start |