Upgrade docker-sonic-vs and docker-syncd-vs to Bullseye (#13294)
* Upgrade docker-sonic-vs and docker-syncd-vs to Bullseye
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
* iproute2: Force a new version and timestamp to be used for the package
There is an issue with Docker's overlay2 storage driver when not using
native diffs (and thus falling back to naive diff mode), which is the
case in the CI builds. The way the naive diff mode detects changes is by
comparing the file size and comparing the timestamps (specifically, I
believe it's the modification timestamp), and if there's a change there,
then it's considered a change that needs to be recorded as part of that
layer.
The problem is that with the code being added in the patch, the file
size remains the same, and the timestamp of binary files appear to be
the same timestamp as the changelog entry (likely for reproducible build
purposes). The file size remains the same likely due to extra padding
within the file introduced by relro. Because of this, Docker doesn't
detect this file has changed, and doesn't save the new file as part of
this layer.
To work around this, create a new changelog entry (with a new version as
well) with a new timestamp. This will result in the binary files having
a different timestamp, and thus will get saved by Docker as part of that
layer.
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
---------
Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>
2023-03-19 23:14:27 -05:00
|
|
|
FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
|
2018-11-21 00:32:40 -06:00
|
|
|
|
|
|
|
|
ARG docker_container_name
|
2021-04-26 15:51:50 -05:00
|
|
|
|
2018-11-21 00:32:40 -06:00
|
|
|
## Make apt-get non-interactive
|
|
|
|
|
ENV DEBIAN_FRONTEND=noninteractive
|
|
|
|
|
|
|
|
|
|
RUN apt-get update
|
|
|
|
|
|
2021-11-25 07:38:17 -06:00
|
|
|
RUN apt-get install -f -y libcap2-bin
|
2019-09-14 22:27:09 -05:00
|
|
|
|
2018-11-21 00:32:40 -06:00
|
|
|
COPY \
|
|
|
|
|
{% for deb in docker_syncd_vs_debs.split(' ') -%}
|
|
|
|
|
debs/{{ deb }}{{' '}}
|
|
|
|
|
{%- endfor -%}
|
|
|
|
|
debs/
|
|
|
|
|
|
|
|
|
|
RUN dpkg -i \
|
|
|
|
|
{% for deb in docker_syncd_vs_debs.split(' ') -%}
|
|
|
|
|
debs/{{ deb }}{{' '}}
|
2021-11-25 07:38:17 -06:00
|
|
|
{%- endfor %} || apt-get install -f -y
|
2018-11-21 00:32:40 -06:00
|
|
|
|
|
|
|
|
COPY ["start.sh", "/usr/bin/"]
|
|
|
|
|
|
|
|
|
|
COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
|
2020-03-31 17:00:48 -05:00
|
|
|
COPY ["files/supervisor-proc-exit-listener", "/usr/bin"]
|
|
|
|
|
COPY ["critical_processes", "/etc/supervisor/"]
|
2018-11-21 00:32:40 -06:00
|
|
|
|
|
|
|
|
## Clean up
|
|
|
|
|
RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
|
|
|
|
|
RUN rm -rf /debs
|
|
|
|
|
|
2020-11-22 23:18:44 -06:00
|
|
|
ENTRYPOINT ["/usr/local/bin/supervisord"]
|
