From 0c1db813378362e546f2f9cadb5265bd9b21746c Mon Sep 17 00:00:00 2001 From: Andrey Lebedev Date: Tue, 7 Nov 2023 21:13:28 +0100 Subject: [PATCH] hack: Dockerfile to use UBI image, Makefile to use podman --- hack/Dockerfile.debug | 4 ++-- hack/Makefile.debug | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hack/Dockerfile.debug b/hack/Dockerfile.debug index c51e9123e..356eef79e 100644 --- a/hack/Dockerfile.debug +++ b/hack/Dockerfile.debug @@ -1,5 +1,5 @@ -FROM centos:8 -RUN yum install -y https://github.com/frobware/haproxy-hacks/raw/master/RPMs/haproxy24-2.4.1-1.el8.x86_64.rpm +FROM registry.access.redhat.com/ubi8/ubi +RUN yum install -y https://github.com/frobware/haproxy-builds/raw/master/rhaos-4.14-rhel-8/haproxy26-2.6.13-2.rhaos4.14.el8.x86_64.rpm RUN haproxy -vv RUN INSTALL_PKGS="rsyslog procps-ng util-linux socat" && \ yum install -y $INSTALL_PKGS && \ diff --git a/hack/Makefile.debug b/hack/Makefile.debug index f847b6c18..cc48b3fcd 100644 --- a/hack/Makefile.debug +++ b/hack/Makefile.debug @@ -5,14 +5,15 @@ export GOOS=linux REGISTRY ?= quay.io IMAGE ?= openshift/openshift-router TAG ?= latest +IMAGEBUILDER ?= podman new-openshift-router-image: GO111MODULE=on CGO_ENABLED=0 GOFLAGS=-mod=vendor go build -o openshift-router -gcflags=all="-N -l" ./cmd/openshift-router - imagebuilder -t $(IMAGE):$(TAG) -f hack/Dockerfile.debug . + $(IMAGEBUILDER) build -t $(IMAGE):$(TAG) -f hack/Dockerfile.debug . push: - docker tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) - docker push $(REGISTRY)/$(IMAGE):$(TAG) + $(IMAGEBUILDER) tag $(IMAGE):$(TAG) $(REGISTRY)/$(IMAGE):$(TAG) + $(IMAGEBUILDER) push $(REGISTRY)/$(IMAGE):$(TAG) set-image: oc scale --replicas 0 -n openshift-cluster-version deployments/cluster-version-operator