Build workflows with the productized OSL image

Signed-off-by: Roy Golan <[email protected]>

.github/workflows/main.yml

@@ -31,7 +31,6 @@ jobs:
 
     - name: Log in to Red Hat Registry
       uses: redhat-actions/podman-login@v1
-      if: ${{ ! inputs.it_mode }}
       with:
         registry: registry.redhat.io
         username: ${{ secrets.REGISTRY_REDHAT_IO_USER }}
@@ -50,15 +49,15 @@ jobs:
           build-image
 
     - name: Buildah Action for testing
-      id: build-dev-image
+      id: build-image
       uses: redhat-actions/buildah-build@v2
       if: ${{ inputs.it_mode }}
       with:
         image: serverless-workflow-${{ inputs.workflow_id }}
         tags: latest ${{ github.sha }}
         extra-args: --ulimit nofile=4096:4096
         containerfiles: |
-          pipeline/workflow-builder-dev.Dockerfile
+          pipeline/workflow-builder.Dockerfile
         build-args: |
           WF_RESOURCES=${{ inputs.workflow_id }}
           FLOW_NAME=${{ inputs.workflow_id }}

Makefile

@@ -94,8 +94,6 @@ else
 DOCKERFILE ?= src/main/docker/Dockerfile.jvm
 endif
 
-DEV_DOCKERFILE ?= pipeline/workflow-builder-dev.Dockerfile
-
 ifeq ($(IS_WORKFLOW),true)
 IMAGE_NAME = $(REGISTRY)/$(REGISTRY_REPO)/$(IMAGE_PREFIX)-$(WORKFLOW_ID)
 else
@@ -146,9 +144,6 @@ else
 		--tag ${IMAGE_NAME}:${IMAGE_TAG} --tag ${IMAGE_NAME}:latest .
 endif
 
-build-dev-image: DOCKERFILE=$(DEV_DOCKERFILE)
-build-dev-image: build-image
-
 # Target: push-image
 # Description: Pushes the workflow containerized image to the configured REGISTRY.
 # Usage: make push-image

pipeline/workflow-builder.Dockerfile

@@ -3,14 +3,15 @@
 
 ARG BUILDER_IMAGE
 
-FROM ${BUILDER_IMAGE:-quay.io/kiegroup/kogito-swf-builder:9.99.1.CR1} AS builder
+# The default builder image is the released OSL 1.33 https://catalog.redhat.com/software/containers/openshift-serverless-1/logic-swf-builder-rhel8/6614edd826a5be569c111884?container-tabs=gti
+FROM ${BUILDER_IMAGE:-registry.redhat.io/openshift-serverless-1/logic-swf-builder-rhel8@sha256:6defe106ef355b2d0bd55224564ae6eafb4bb3ac081f8dc9ee410fb05216112d} AS builder
 
 # Temp hack to provide persistence artifacts - with quay.io/kiegroup/kogito-swf-builder:9.99.1.CR1 those dependencies are included in the base image.
 #ENV MAVEN_REPO_URL=https://maven.repository.redhat.com/earlyaccess/all
 
 # variables that can be overridden by the builder
 # To add a Quarkus extension to your application
-ARG QUARKUS_EXTENSIONS="org.kie.kogito:kogito-addons-quarkus-jobs-knative-eventing:9.99.1.redhat-00003,org.kie.kogito:kogito-addons-quarkus-persistence-jdbc:9.99.1.redhat-00003,org.kie.kogito:kogito-addons-persistence-jdbc:9.99.1.redhat-00003,io.quarkus:quarkus-jdbc-postgresql:3.2.9.Final,io.quarkus:quarkus-agroal:3.2.9.Final"
+ARG QUARKUS_EXTENSIONS="QUARKUS_EXTENSIONS=org.kie:kogito-addons-quarkus-jobs-knative-eventing:9.100.0.redhat-00004,org.kie:kie-addons-quarkus-persistence-jdbc:9.100.0.redhat-00004,io.quarkus:quarkus-jdbc-postgresql:3.8.4.redhat-00002,io.quarkus:quarkus-agroal:3.8.4.redhat-00002"
 
 # Args to pass to the Quarkus CLI
 # add extension command