diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-21 19:41:45 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-26 20:01:28 +0200 |
| commit | e0f8cbc50cf7184930a501b0f5452a64f523cd6f (patch) | |
| tree | 1e8f1999a33fc5259eb4a249c16b6f8f4b222d45 /docker/openvswitch | |
| parent | af17cc180e40cc19fb08fb3186de43d5a6c7d83d (diff) | |
| download | kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.tar.gz kolla-e0f8cbc50cf7184930a501b0f5452a64f523cd6f.zip | |
move to Debian 'bullseye'
Bullseye is now in hard freeze cycle and goes for release.
https://release.debian.org/bullseye/freeze_policy.html
Co-Authored-By: Michal Nasiadka <mnasiadka@gmail.com>
Change-Id: I543965a2741cebfa759576a4c75669a7bacd4208
Diffstat (limited to 'docker/openvswitch')
| -rw-r--r-- | docker/openvswitch/openvswitch-base/Dockerfile.j2 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/docker/openvswitch/openvswitch-base/Dockerfile.j2 b/docker/openvswitch/openvswitch-base/Dockerfile.j2 index 5bc40ec47..1ddf669e9 100644 --- a/docker/openvswitch/openvswitch-base/Dockerfile.j2 +++ b/docker/openvswitch/openvswitch-base/Dockerfile.j2 @@ -34,7 +34,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump \ +# NOTE(hrw): Upstream moved tcpdump to /usr/bin/ in 4.99 version (used in Debian) +RUN if [ -e /usr/sbin/tcpdump ]; then mv /usr/sbin/tcpdump /usr/bin/tcpdump; fi \ && touch /usr/local/bin/kolla_openvswitch_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_openvswitch_extend_start |