Skip to content

Commit

Permalink
Upgrade ubuntu from 20.04 to 24.04 LTS version
Browse files Browse the repository at this point in the history
Signed-off-by: Artem Barger <artem@bargr.net>
  • Loading branch information
C0rWin committed Aug 27, 2024
1 parent bbf2300 commit 8989b64
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ?= 24.04
FABRIC_VER ?= 3.0.0

# 3rd party image version
Expand Down Expand Up @@ -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) \
Expand Down
6 changes: 3 additions & 3 deletions images/baseos/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
USER chaincode

0 comments on commit 8989b64

Please sign in to comment.