From ae7cb6fe242197ff0489ea14ec946b8b924ceb25 Mon Sep 17 00:00:00 2001
From: Artem Barger <artem@bargr.net>
Date: Tue, 27 Aug 2024 22:29:20 +0300
Subject: [PATCH] Upgrade ubuntu from 20.04 to 24.04 LTS version

Signed-off-by: Artem Barger <artem@bargr.net>
---
 Makefile                 | 4 ++--
 images/baseos/Dockerfile | 6 +++---
 images/ccenv/Dockerfile  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e90ff135103..9096f49a2b7 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@
 #   - unit-test - runs the go-test based unit tests
 #   - verify - runs unit tests for only the changed package tree
 
-UBUNTU_VER ?= 20.04
+UBUNTU_VER ?= 22.04
 FABRIC_VER ?= 3.0.0
 
 # 3rd party image version
@@ -248,7 +248,7 @@ $(BUILD_DIR)/images/peer/$(DUMMY):    BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
 $(BUILD_DIR)/images/orderer/$(DUMMY): BUILD_ARGS=--build-arg GO_TAGS=${GO_TAGS}
 
 $(BUILD_DIR)/images/%/$(DUMMY):
-	@echo "Building Docker image $(DOCKER_NS)/fabric-$*"
+	@echo "Building Docker image $(DOCKER_NS)/fabric-$* with Ubuntu version $(UBUNTU_VER)"
 	@mkdir -p $(@D)
 	$(DBUILD) -f images/$*/Dockerfile \
 		--build-arg GO_VER=$(GO_VER) \
diff --git a/images/baseos/Dockerfile b/images/baseos/Dockerfile
index 2b1e5d9b85b..12ac91fc353 100644
--- a/images/baseos/Dockerfile
+++ b/images/baseos/Dockerfile
@@ -24,7 +24,7 @@ FROM ubuntu:${UBUNTU_VER} as base
 RUN apt update && apt install -y \
     tzdata
 
-RUN     addgroup --gid 500 chaincode
-RUN     adduser  --disabled-password --gecos "" --uid 500 --gid 500 --home /home/chaincode chaincode
+RUN     groupadd --gid 500 chaincode
+RUN     useradd -c "" -u 500 -g 500 -d /home/chaincode -M chaincode
 
-USER    chaincode
\ No newline at end of file
+USER    chaincode
diff --git a/images/ccenv/Dockerfile b/images/ccenv/Dockerfile
index 3b2dc3ac60f..760e878a535 100644
--- a/images/ccenv/Dockerfile
+++ b/images/ccenv/Dockerfile
@@ -33,8 +33,8 @@ RUN apt update && apt install -y \
 RUN curl -sL https://go.dev/dl/go${GO_VER}.${TARGETOS}-${TARGETARCH}.tar.gz | tar zxvf - -C /usr/local
 ENV PATH="/usr/local/go/bin:$PATH"
 
-RUN addgroup --gid 500 chaincode
-RUN adduser  --disabled-password --gecos "" --uid 500 --gid 500 --home /home/chaincode chaincode
+RUN     groupadd --gid 500 chaincode
+RUN     useradd -c "" -u 500 -g 500 -d /home/chaincode -M chaincode
 
 RUN mkdir    -p /chaincode/output /chaincode/input
 RUN chown    -R chaincode:chaincode /chaincode