From 90e573d56b59befc0bff9e84ed45086f17236c9d Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Sat, 9 Nov 2019 04:08:03 +0000 Subject: [PATCH 1/4] [build] clear dpkg cache and update sources This change is intended to fix the issue with dpkg-query during build process. The symptom is dpkg-query failed to open package info file, usually /var/lib/dpkg/updates/000? This issue happens rarely. Not sure if this change has fully addressed the issue. So far my continuous build test didn't fail. Signed-off-by: Ying Xie --- sonic-slave-stretch/Dockerfile.j2 | 1 + sonic-slave/Dockerfile.j2 | 1 + 2 files changed, 2 insertions(+) diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index af6e7deadc31..fd0dddbc226c 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -388,3 +388,4 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian {%- endif %} RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker +RUN dpkg --clear-avail; apt-get update diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2 index 7ed7c4eb7096..e2984cc11bdd 100644 --- a/sonic-slave/Dockerfile.j2 +++ b/sonic-slave/Dockerfile.j2 @@ -363,3 +363,4 @@ RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/d RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list RUN apt-get -o Acquire::Check-Valid-Until=false update RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk +RUN dpkg --clear-avail; apt-get update From f91c7cd5cb3183607bc23f834b2cbb615da726b4 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Sat, 9 Nov 2019 20:22:45 +0000 Subject: [PATCH 2/4] fix build error --- sonic-slave-stretch/Dockerfile.j2 | 2 +- sonic-slave/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index fd0dddbc226c..dcb965b6f5d9 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -388,4 +388,4 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian {%- endif %} RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker -RUN dpkg --clear-avail; apt-get update +RUN apt-get -o Acquire::Check-Valid-Until=false update diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2 index e2984cc11bdd..df5dc3b1faaf 100644 --- a/sonic-slave/Dockerfile.j2 +++ b/sonic-slave/Dockerfile.j2 @@ -363,4 +363,4 @@ RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/d RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list RUN apt-get -o Acquire::Check-Valid-Until=false update RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk -RUN dpkg --clear-avail; apt-get update +RUN dpkg --clear-avail; apt-get -o Acquire::Check-Valid-Until=false update From ca509c2467b6d229b8d983638ae66e258a446bb9 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Sun, 10 Nov 2019 00:30:15 +0000 Subject: [PATCH 3/4] build - 2 --- sonic-slave-stretch/Dockerfile.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index dcb965b6f5d9..a988929aba72 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -388,4 +388,4 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian {%- endif %} RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker -RUN apt-get -o Acquire::Check-Valid-Until=false update +RUN dpkg --clear-avail; apt-get -o Acquire::Check-Valid-Until=false update From 4ad4566f7770bf0b7dabfcb081073e1252d3c0ae Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Mon, 11 Nov 2019 19:07:29 +0000 Subject: [PATCH 4/4] Add comments to prevent unexpected changes after the cleanup --- sonic-slave-stretch/Dockerfile.j2 | 4 +++- sonic-slave/Dockerfile.j2 | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/sonic-slave-stretch/Dockerfile.j2 b/sonic-slave-stretch/Dockerfile.j2 index a988929aba72..8cb29b5a46ae 100644 --- a/sonic-slave-stretch/Dockerfile.j2 +++ b/sonic-slave-stretch/Dockerfile.j2 @@ -388,4 +388,6 @@ RUN apt-get install -y docker-ce=5:18.09.5~3-0~debian-stretch RUN apt-get install -y docker-ce=18.06.3~ce~3-0~debian {%- endif %} RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/docker -RUN dpkg --clear-avail; apt-get -o Acquire::Check-Valid-Until=false update + +# Final cleanup. Please add new changes above. +RUN dpkg --clear-avail; apt-get update diff --git a/sonic-slave/Dockerfile.j2 b/sonic-slave/Dockerfile.j2 index df5dc3b1faaf..25efba4d90b1 100644 --- a/sonic-slave/Dockerfile.j2 +++ b/sonic-slave/Dockerfile.j2 @@ -363,4 +363,6 @@ RUN echo "DOCKER_OPTS=\"--experimental --storage-driver=vfs\"" >> /etc/default/d RUN echo "deb [arch={{ CONFIGURED_ARCH }}] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list RUN apt-get -o Acquire::Check-Valid-Until=false update RUN apt-get -y -o Acquire::Check-Valid-Until=false install ca-certificates-java=20161107~bpo8+1 openjdk-8-jdk + +# Final cleanup. Please add new changes above. RUN dpkg --clear-avail; apt-get -o Acquire::Check-Valid-Until=false update