From be93e2251be721ffdbeba8110ef56deeaab36658 Mon Sep 17 00:00:00 2001 From: Cole Walker Date: Tue, 31 Jan 2023 15:50:42 -0500 Subject: [PATCH] Fix centos image build failure Corrects an issue with the centos stable_docker_image files for the notificationservice-base image which was resulting in an image build failure. notificationservice-base.stable_docker_image was missing the path to the Dockerfile. The notificationservice-base-v2.stable_docker_image file was also incorrectly named. Test plan: PASS: Build centos images for notificationservice-base and notificationservice-base-v2 PASS Build debian images for notificationservice-base and notificationservice-base-v2 Closes-bug: 2004428 Signed-off-by: Cole Walker Change-Id: I17984044888e4cf5e8985376e28f17e143341472 --- centos_stable_docker_images.inc | 1 + .../centos/notificationservice-base-v2.stable_docker_image | 4 ++++ .../centos/notificationservice-base.stable_docker_image | 4 ---- .../centos/notificationservice-base.stable_docker_image | 4 +++- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 notificationservice-base-v2/centos/notificationservice-base-v2.stable_docker_image delete mode 100644 notificationservice-base-v2/centos/notificationservice-base.stable_docker_image diff --git a/centos_stable_docker_images.inc b/centos_stable_docker_images.inc index ff7bc4f..4ae74b4 100644 --- a/centos_stable_docker_images.inc +++ b/centos_stable_docker_images.inc @@ -1,3 +1,4 @@ notificationservice-base +notificationservice-base-v2 locationservice-base notificationclient-base diff --git a/notificationservice-base-v2/centos/notificationservice-base-v2.stable_docker_image b/notificationservice-base-v2/centos/notificationservice-base-v2.stable_docker_image new file mode 100644 index 0000000..ee16275 --- /dev/null +++ b/notificationservice-base-v2/centos/notificationservice-base-v2.stable_docker_image @@ -0,0 +1,4 @@ +BUILDER=docker +LABEL=notificationservice-base-v2 +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile diff --git a/notificationservice-base-v2/centos/notificationservice-base.stable_docker_image b/notificationservice-base-v2/centos/notificationservice-base.stable_docker_image deleted file mode 100644 index e028c69..0000000 --- a/notificationservice-base-v2/centos/notificationservice-base.stable_docker_image +++ /dev/null @@ -1,4 +0,0 @@ -BUILDER=docker -LABEL=notificationservice-base -DOCKER_CONTEXT=../docker -DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationservice-base/centos/notificationservice-base.stable_docker_image b/notificationservice-base/centos/notificationservice-base.stable_docker_image index 2bd26d6..88ebd0f 100644 --- a/notificationservice-base/centos/notificationservice-base.stable_docker_image +++ b/notificationservice-base/centos/notificationservice-base.stable_docker_image @@ -1,2 +1,4 @@ BUILDER=docker -LABEL=notificationservice-base \ No newline at end of file +LABEL=notificationservice-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile