Skip to content

Commit b083696

Browse files
authored
addressed red hat preflight errors in trident docker images
1 parent dd42365 commit b083696

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

.dockerignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
**
22
!bin/**
3-
!*.txt
3+
!*.txt
4+
!LICENSE

Dockerfile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,20 @@ ADD ${CHWRAP_BIN} /rootfs/
3939

4040
FROM scratch
4141

42-
LABEL maintainers="The NetApp Trident Team" \
43-
app="trident.netapp.io" \
44-
description="Trident Storage Orchestrator"
42+
ARG VERSION
43+
44+
LABEL maintainer="The NetApp Trident Team" \
45+
app="trident.netapp.io" \
46+
summary="Trident Storage Orchestrator" \
47+
description="Trident Storage Orchestrator manages persistent storage for containerized applications." \
48+
name="trident" \
49+
vendor="NetApp, Inc." \
50+
version="${VERSION}" \
51+
release="${VERSION}"
4552

4653
COPY --from=deps /rootfs /
4754

55+
COPY LICENSE NOTICE.txt /licenses/
56+
4857
ENTRYPOINT ["/bin/tridentctl"]
4958
CMD ["version"]

Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ buildx_create_instance = $(DOCKER_BUILDX_BUILD_CLI) create --name $(DOCKER_BUILD
239239
docker_build_linux = $1 build \
240240
--platform $2 \
241241
--build-arg ARCH=$(call arch,$2) \
242+
--build-arg VERSION=$(VERSION) \
242243
--build-arg BIN=$(call binary_path,trident_orchestrator,$2) \
243244
--build-arg CLI_BIN=$(call binary_path,tridentctl,$2) \
244245
--build-arg NODE_PREP_BIN=$(call binary_path,node_prep,$2) \
@@ -276,6 +277,7 @@ docker_build_operator = $1 build \
276277
--platform $2 \
277278
--file operator/Dockerfile \
278279
--build-arg BIN=$(call binary_path,trident-operator,$2) \
280+
--build-arg VERSION=$(VERSION) \
279281
$(if $(TRIDENT_DEPS_IMAGE),--build-arg DEPS_IMAGE=$(TRIDENT_DEPS_IMAGE)) \
280282
--tag $3 \
281283
--rm \

operator/Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,21 @@ RUN mkdir /real-certs; \
88

99
FROM scratch
1010

11+
ARG VERSION
12+
1113
LABEL maintainer="The NetApp Trident Team" \
1214
app="trident-operator.netapp.io" \
1315
summary="Trident Operator" \
1416
description="Trident Operator manages the lifecycle of Trident instances in a Kubernetes cluster." \
1517
name="trident-operator" \
1618
vendor="NetApp, Inc." \
17-
version="25.10.0" \
18-
release="25.10.0"
19+
version="${VERSION}" \
20+
release="${VERSION}"
1921

2022
ARG BIN=trident-operator
2123

2224
COPY --from=deps /real-certs/ /etc/ssl/certs/
23-
COPY NOTICE.txt NOTICE_ASUP_module.txt /licenses/
25+
COPY LICENSE NOTICE.txt /licenses/
2426
COPY ${BIN} /trident-operator
2527

2628
ENTRYPOINT ["/trident-operator"]

0 commit comments

Comments
 (0)