Tweaks to the Iron Bank docker context #66942
Conversation
pugnascotia
added
>enhancement
:Delivery/Packaging
|
Pinging @elastic/es-delivery (Team:Delivery) |
|
@jmlrt Did you want the |
| @@ -1,7 +1,7 @@ | |||
| { | |||
| "resources": [ | |||
| { | |||
| "url": "https://artifacts.elastic.co/downloads/elasticsearch/elasticsearch-${version}-linux-x86_64.tar.gz", | |||
| "url": "<artifact_path>/elasticsearch-${version}-linux-x86_64.tar.gz", | |||
There was a problem hiding this comment.
What is this syntax? Does this value get replaced somewhere, and if so, how?
There was a problem hiding this comment.
It’s literally just a placeholder. Infra are planning a process to substitute the correct values during the unified release process.
| @@ -364,6 +369,9 @@ LABEL name="Elasticsearch" \\ | |||
| RUN mkdir /licenses && \\ | |||
| cp LICENSE.txt /licenses/LICENSE | |||
| <% } %> | |||
| <% if (docker_base == 'iron_bank') { %> | |||
| COPY LICENSE /licenses/LICENSE.addendum | |||
There was a problem hiding this comment.
https://github.com/elastic/ironbank/blob/master/Elastic_License_w_gov_addendum_2020-10-08-1.txt contains standard license + addendum so it should completely replace the other license file.
Can you also add this license file to the generated build context tarball?
There was a problem hiding this comment.
The simplest thing to do would be to copy that file into the ES repo and add it into the generated build context. What do you think? Obviously having it in two places isn't ideal, but fetching the license file when the task run also feels fragile.
There was a problem hiding this comment.
The license is now included in the repo and in the generated build context.
This PR makes a few tweaks to the Docker context that the ES build can generate, in order to align it more closely with what we submit to DSOP.
This PR makes a few tweaks to the Docker context that the ES build can generate, in order to align it more closely with what we submit to DSOP.