Dockerfile: updates for 5.3

Signed-off-by: Andrew Schoen <[email protected]>

Author: andrewschoen

.tekton/haproxy-5-3-pull-request.yaml

@@ -24,7 +24,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/rhceph-dev/haproxy:on-pr-{{revision}}
+    value: quay.io/rhceph-dev/haproxy:on-pr-v5.3-{{revision}}
   - name: image-expires-after
     value: 5d
   - name: build-platforms
@@ -554,6 +554,12 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - "v5.3"
+          - "pull-request-{{pull_request_number}}"
+          - "from-branch-{{source_branch}}"
+          - "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
       runAfter:
       - build-image-index
       taskRef:

.tekton/haproxy-5-3-push.yaml

@@ -23,7 +23,7 @@ spec:
   - name: revision
     value: '{{revision}}'
   - name: output-image
-    value: quay.io/rhceph-dev/haproxy:{{revision}}
+    value: quay.io/rhceph-dev/haproxy:v5.3-{{revision}}
   - name: build-platforms
     value:
     - linux/x86_64
@@ -551,6 +551,10 @@ spec:
         value: $(tasks.build-image-index.results.IMAGE_URL)
       - name: IMAGE_DIGEST
         value: $(tasks.build-image-index.results.IMAGE_DIGEST)
+      - name: ADDITIONAL_TAGS
+        value:
+          - "v5.3"
+          - "{{target_branch}}-$(tasks.clone-repository.results.commit-timestamp)"
       runAfter:
       - build-image-index
       taskRef:

Dockerfile

@@ -1,17 +1,14 @@
-FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi9-minimal:latest
+FROM --platform=$BUILDPLATFORM registry.access.redhat.com/ubi8-minimal:latest
 
 RUN microdnf update -y
 
 # If you edit this version number, edit it here *and* the LABEL below:
-RUN microdnf install -y haproxy && rpm -q haproxy-2.4.22
-
-# Only install qatengine package when building on x86_64 arch.
-RUN if [ $(uname --hardware-platform) == "linux/amd64" ]; then microdnf install -y qatengine; fi
+RUN microdnf install -y haproxy22
 
 LABEL maintainer="Guillaume Abrioux <[email protected]>"
 LABEL com.redhat.component="rhceph-haproxy-container"
 LABEL name="haproxy"
-LABEL version=2.4.22
+LABEL version=2.2.19
 LABEL description="HAProxy container"
 LABEL summary="Provides HAproxy container."
 LABEL io.k8s.display-name="HAProxy container"