From 852af8c16b7c858d479e7a543f8c8391f67f5c2c Mon Sep 17 00:00:00 2001 From: Rose Judge Date: Thu, 13 Jul 2023 15:02:40 -0700 Subject: [PATCH] Update `samples` dfiles to use correct base images There were several Dockerfiles in the `samples` repo that were referring to base images that either no longer exist or are much out of date (5+ years). This commit updates the base images in those files so that Tern/Docker can build and analyze them. Resolves #1235 Signed-off-by: Rose Judge --- samples/debian_vim/Dockerfile | 2 +- samples/photon_3_layers/Dockerfile | 2 +- samples/photon_git/Dockerfile | 2 +- samples/photon_openjre/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/debian_vim/Dockerfile b/samples/debian_vim/Dockerfile index 8a37230c..1d562683 100644 --- a/samples/debian_vim/Dockerfile +++ b/samples/debian_vim/Dockerfile @@ -1,4 +1,4 @@ # Copyright (c) 2017 VMware, Inc. All Rights Reserved. # SPDX-License-Identifier: BSD-2-Clause -FROM debian:jessie +FROM debian:bullseye RUN apt-get update && apt-get install -y vim && apt-get clean diff --git a/samples/photon_3_layers/Dockerfile b/samples/photon_3_layers/Dockerfile index 24e5f9e0..cc46969c 100644 --- a/samples/photon_3_layers/Dockerfile +++ b/samples/photon_3_layers/Dockerfile @@ -1,5 +1,5 @@ # Copyright (c) 2017 VMware, Inc. All Rights Reserved # SPDX-License-Identifier: BSD-2-Clause -FROM vmware/photon2:GA +FROM photon:3.0 RUN tyum install -y git && tyum clean all RUN tyum install -y vim && tyum clean all diff --git a/samples/photon_git/Dockerfile b/samples/photon_git/Dockerfile index 8204b59d..96983f7a 100644 --- a/samples/photon_git/Dockerfile +++ b/samples/photon_git/Dockerfile @@ -1,4 +1,4 @@ # Copyright (c) 2017 VMware, Inc. All Rights Reserved # SPDX-License-Identifier: BSD-2-Clause -FROM vmware/photon:1.0 +FROM photon:5.0 RUN tyum install -y git && tyum clean all diff --git a/samples/photon_openjre/Dockerfile b/samples/photon_openjre/Dockerfile index 9508d670..3b6d16f4 100644 --- a/samples/photon_openjre/Dockerfile +++ b/samples/photon_openjre/Dockerfile @@ -1,4 +1,4 @@ # Copyright (c) 2017 VMware, Inc. All Rights Reserved # SPDX-License-Identifier: BSD-2-Clause -FROM vmware/photon:1.0 +FROM photon:5.0 RUN tyum install -y openjre && tyum clean all