Implement code review feedback

- Change base of docker-sonic-p4 to bullseye base - Remove fallback case not needed for dists later than Jessie Signed-off-by: Christian Svensson <blue@cmd.nu>
sonic-net · Nov 3, 2023 · b236f50 · b236f50
1 parent 4bdcb95
commit b236f50
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/platform/p4/docker-sonic-p4/Dockerfile.j2 b/platform/p4/docker-sonic-p4/Dockerfile.j2
@@ -1,4 +1,4 @@
-FROM docker-config-engine-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
+FROM docker-config-engine-bullseye-{{DOCKER_USERNAME}}:{{DOCKER_USERTAG}}
 
 ARG docker_container_name
 

diff --git a/src/sonic-build-hooks/scripts/collect_version_files b/src/sonic-build-hooks/scripts/collect_version_files
@@ -7,7 +7,6 @@ TARGET_PATH=$1
 [ -z "$TARGET_PATH" ] && TARGET_PATH=$POST_VERSION_PATH
 ARCH=$(dpkg --print-architecture)
 DIST=$(grep VERSION_CODENAME /etc/os-release | cut -d= -f2)
-([ -z "$DIST" ] && grep -q bullseye /etc/os-release) && DIST=bullseye
 
 mkdir -p $TARGET_PATH
 chmod a+rw $TARGET_PATH