diff options
| author | Zuul <zuul@review.opendev.org> | 2024-02-22 13:43:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-02-22 13:43:09 +0000 |
| commit | 0246b32d70da39f6e837974f339e845f0c8b9e8f (patch) | |
| tree | a0b47f8f219469ed36eb4aa1b8d5c721d68f2f76 /docker/etcd | |
| parent | 756ee984c3c761514115c342e7cba9a3cb533d02 (diff) | |
| parent | 750a137815f1ca58c7e65d23e9d63403ea282b1a (diff) | |
| download | kolla-0246b32d70da39f6e837974f339e845f0c8b9e8f.tar.gz kolla-0246b32d70da39f6e837974f339e845f0c8b9e8f.zip | |
Merge "Move curl sources to sources.py"
Diffstat (limited to 'docker/etcd')
| -rw-r--r-- | docker/etcd/Dockerfile.j2 | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/docker/etcd/Dockerfile.j2 b/docker/etcd/Dockerfile.j2 index 9fb067359..c75c861f0 100644 --- a/docker/etcd/Dockerfile.j2 +++ b/docker/etcd/Dockerfile.j2 @@ -9,16 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {{ macros.configure_user(name='etcd') }} -{% block etcd_repository_version %} -# NOTE(wszumski): It is suggested to upgrade one minor version at a time: -# https://github.com/etcd-io/website/blob/cf046546dec9e1dcea966dc21ea38027c3290e9a/content/en/docs/v3.4/upgrades/upgrade_3_4.md#upgrade-requirements -ARG etcd_version=v3.4.27 -ARG etcd_url=https://github.com/etcd-io/etcd/releases/download/${etcd_version}/etcd-${etcd_version}-linux-{{debian_arch}}.tar.gz -{% endblock %} +{% block etcd_install %} +ADD etcd-archive /etcd-source -RUN curl ${etcd_url} -o /tmp/etcd.tar.gz \ - && tar -C /usr/bin -xvz --strip-components=1 --wildcards '*/etcd' --wildcards '*/etcdctl' -f /tmp/etcd.tar.gz \ - && rm -f /tmp/etcd.tar.gz +RUN ln -s etcd-source/* etcd \ + && cp /etcd/etcd /etcd/etcdctl /usr/bin +{% endblock %} COPY etcd_sudoers /etc/sudoers.d/kolla_etcd_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start |