Skip to content

Commit

Permalink
fix: Use ubi7 instead of ubi7/go-toolset for final image
Browse files Browse the repository at this point in the history
  • Loading branch information
David-T-White committed Jul 24, 2023
1 parent f64a389 commit 561ce35
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 11 deletions.
8 changes: 4 additions & 4 deletions Dockerfile.redhat
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ RUN ls -l /

########################################################################

FROM registry.access.redhat.com/ubi7/go-toolset:1.19
FROM registry.access.redhat.com/ubi7

ARG version=v1.7.2
ARG vcs_ref=89c5c4558d77735c53f25d44789938f6dc609e62
ARG build_date=2023-06-28T00:45:11+00:00
ARG version=v1.7.3
ARG vcs_ref=f64a389bd19c45ff31ce5026ea28f7ad3e954723
ARG build_date=2023-07-20T14:37:39+00:00
ARG vendor=Seagate
ARG family="Exos X"
ARG app="${family} CSI Driver"
Expand Down
17 changes: 11 additions & 6 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ endif
ifdef VERSION
VERSION := $(VERSION)
else
VERSION := v1.7.2
VERSION := v1.7.3
endif
HELM_VERSION := $(subst v,,$(VERSION))
VERSION_FLAG = -X $(GITHUB_URL)/pkg/common.Version=$(VERSION)
Expand Down Expand Up @@ -129,23 +129,28 @@ REDHAT_IMAGE=$(REDHAT_IMAGE_BASE):$(VERSION)
REDHAT_IMAGE_LATEST=$(REDHAT_IMAGE_BASE):latest
PREFLIGHT_OPTIONS=
PREFLIGHT_SUBMIT=
PFLT_DOCKERCONFIG=.preflight-auth.json

preflight:
preflight: $(PFLT_DOCKERCONFIG)
-docker run -d -p 5000:5000 --name registry registry:2 # make sure local registry is running
docker tag $(IMAGE) $(PREFLIGHT_IMAGE)
docker push $(PREFLIGHT_IMAGE)
$(PREFLIGHT) check container $(PREFLIGHT_SUBMIT) $(PREFLIGHT_OPTIONS) $(PREFLIGHT_IMAGE) \
PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG)

PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG) $(PREFLIGHT) check container $(PREFLIGHT_SUBMIT) $(PREFLIGHT_OPTIONS) $(PREFLIGHT_IMAGE)

preflight-submit: .preflight-auth.json
$(MAKE) preflight PREFLIGHT_SUBMIT="--submit" \
PREFLIGHT_OPTIONS="--pyxis-api-token=$(PYXIS_API_TOKEN) --certification-project-id=$(REDHAT_PROJECT_ID)" \
PREFLIGHT_IMAGE=$(REDHAT_IMAGE) PFLT_DOCKERCONFIG=.preflight-auth.json
PREFLIGHT_IMAGE=$(REDHAT_IMAGE) PFLT_DOCKERCONFIG=$(PFLT_DOCKERCONFIG)

tag-latest:
podman tag $(REDHAT_IMAGE) $(REDHAT_IMAGE_LATEST)
podman push $(REDHAT_IMAGE_LATEST)

preflight-push:
podman login -u redhat-isv-containers+$(REDHAT_PROJECT_ID)-robot -p $(REGISTRY_KEY) quay.io
podman tag $(IMAGE) $(REDHAT_IMAGE)
podman push $(REDHAT_IMAGE)

.preflight-auth.json:
podman login -u redhat-isv-containers+610494ea40182fa9651cdab0-robot -p $(REGISTRY_KEY) --authfile "$@" quay.io

Expand Down
2 changes: 1 addition & 1 deletion helm/csi-charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ image:
repository: ghcr.io/seagate/seagate-exos-x-csi
# -- Tag to use for nodes and controller
# @default -- Uses Chart.appVersion value by default if tag does not specify a new version.
tag: "v1.7.2"
tag: "v1.7.3"
# -- Default is set to IfNotPresent, to override use Always here to always pull the specified version
pullPolicy: Always
# -- Controller sidecar for provisioning
Expand Down

0 comments on commit 561ce35

Please sign in to comment.