Skip to content

Commit

Permalink
[7.11 backport] Update dockerfile template to allow selection of arch…
Browse files Browse the repository at this point in the history
…itecture by env (#12642)

Clean backport of #12636

This commit updates the dockerfile template to support environment
variables being used to retrieve the architecture appropriate logstash
build, in the same way as is currently done for the Elasticsearch docker build.
This is required to support the official dockerhub builds of Logstash.

Relates #12578
  • Loading branch information
robbavey authored Feb 4, 2021
1 parent 3beb72b commit 5e540e7
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions docker/templates/Dockerfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
{% endif -%}

{% if image_flavor == 'oss' -%}
{% set tarball = 'logstash-oss-%s-linux-%s.tar.gz' % (elastic_version, arch) -%}
{% set tarball = 'logstash-oss-%s-linux-$(arch).tar.gz' % (elastic_version) -%}
{% set license = 'Apache 2.0' -%}
{% else -%}
{% set tarball = 'logstash-%s-linux-%s.tar.gz' % (elastic_version, arch) -%}
{% set tarball = 'logstash-%s-linux-$(arch).tar.gz' % (elastic_version) -%}
{% set license = 'Elastic License' -%}
{% endif -%}

Expand Down

0 comments on commit 5e540e7

Please sign in to comment.