Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dockerfile for building the image using ubi-micro base image #23

Merged
merged 2 commits into from
May 31, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022 - 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -16,10 +16,10 @@

NAME:=csi-metadata-retriever

# Dockerfile defines which base image to use [Dockerfile.centos, Dockerfile.ubi, Dockerfile.ubi.min, Dockerfile.ubi.alt]
# Dockerfile defines which base image to use [Dockerfile.centos, Dockerfile.ubi, Dockerfile.ubi.min, Dockerfile.ubi.alt, Dockerfile.ubi.micro]
# e.g.:$ make docker DOCKER_FILE=Dockerfile.ubi.alt
ifndef DOCKER_FILE
DOCKER_FILE = Dockerfile.ubi.min
DOCKER_FILE = Dockerfile.ubi.micro
endif

# Tag parameters
Expand Down
4 changes: 2 additions & 2 deletions docker-files/Dockerfile.centos
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022 - 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@ LABEL vendor="Dell Inc." \
name="csi-metadata-retriever" \
summary="CSI Metadata Retriever sidecar" \
description="CSI Metadata Retriever sidecar for metadata retrievel via kubeapi" \
version="1.1.0" \
version="1.4.0" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
4 changes: 2 additions & 2 deletions docker-files/Dockerfile.ubi
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022 - 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,7 @@ LABEL vendor="Dell Inc." \
name="csi-metadata-retriever" \
summary="CSI Metadata Retriever sidecar" \
description="CSI Metadata Retriever sidecar for metadata retrievel via kubeapi" \
version="1.3.0" \
version="1.4.0" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
4 changes: 2 additions & 2 deletions docker-files/Dockerfile.ubi.alt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022 - 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -23,7 +23,7 @@ LABEL vendor="Dell Inc." \
name="csi-metadata-retriever" \
summary="CSI Metadata Retriever sidecar" \
description="CSI Metadata Retriever sidecar for metadata retrievel via kubeapi" \
version="1.3.0" \
version="1.4.0" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
31 changes: 31 additions & 0 deletions docker-files/Dockerfile.ubi.micro
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#
#
# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
# http://www.apache.org/licenses/LICENSE-2.0
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
#
# Dockerfile to build CSI Metadata Retriever sidecar
# based on UBI-micro image
# Requires: RHEL host with subscription
# UBI Image: ubi8/ubi-micro:8.7-8
FROM registry.access.redhat.com/ubi8/ubi-micro:8.7-8

LABEL vendor="Dell Inc." \
name="csi-metadata-retriever" \
summary="CSI Metadata Retriever sidecar" \
description="CSI Metadata Retriever sidecar for metadata retrievel via kubeapi" \
version="1.4.0" \
license="Apache-2.0"

COPY licenses /licenses
COPY "csi-metadata-retriever" .
ENTRYPOINT ["/csi-metadata-retriever"]
4 changes: 2 additions & 2 deletions docker-files/Dockerfile.ubi.min
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022- 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand All @@ -24,7 +24,7 @@ LABEL vendor="Dell Inc." \
name="csi-metadata-retriever" \
summary="CSI Metadata Retriever sidecar" \
description="CSI Metadata Retriever sidecar for metadata retrievel via kubeapi" \
version="1.3.0" \
version="1.4.0" \
license="Apache-2.0"

COPY licenses /licenses
Expand Down
4 changes: 2 additions & 2 deletions docker.mk
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#
#
# Copyright © 2022 Dell Inc. or its subsidiaries. All Rights Reserved.
# Copyright © 2022 - 2023 Dell Inc. or its subsidiaries. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -33,7 +33,7 @@ ifndef DOCKER_IMAGE_NAME
endif

ifndef BASEIMAGE
BASEIMAGE=ubi-minimal:8.7-1085
BASEIMAGE=registry.access.redhat.com/ubi8/ubi-micro:8.7-8
endif

# figure out if podman or docker should be used (use podman if found)
Expand Down