This is an automated email from the ASF dual-hosted git repository.

marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git


The following commit(s) were added to refs/heads/main by this push:
     new e2c72cd  publish docker (#376)
e2c72cd is described below

commit e2c72cd9d70bd0546d1f99400c4c101f1500886c
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Fri Jun 17 15:56:11 2022 -0400

    publish docker (#376)
---
 .github/workflows/builder.yml                      | 35 ++++++++++++++++++++++
 karavan-builder/Dockerfile                         |  2 +-
 .../openshift/karavan-builder-task.yaml            | 17 +++++++----
 3 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml
new file mode 100644
index 0000000..a382111
--- /dev/null
+++ b/.github/workflows/builder.yml
@@ -0,0 +1,35 @@
+name: Build and Push Builder Image
+
+on:
+  push:
+    branches: [ main ]
+  workflow_dispatch:
+
+env:
+  REGISTRY: ghcr.io
+  IMAGE_NAME: ${{ github.repository }}-builder
+  TAG: 0.0.16
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        with:
+          context: .
+          file: karavan-builder/Dockerfile
+          push: true
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.TAG }}
diff --git a/karavan-builder/Dockerfile b/karavan-builder/Dockerfile
index 388f5b6..b41be01 100644
--- a/karavan-builder/Dockerfile
+++ b/karavan-builder/Dockerfile
@@ -1,4 +1,4 @@
-FROM jbangdev/jbang-action
+FROM jbangdev/jbang-action:0.95.0
 
 # Add Camel-JBang
 RUN jbang trust add -o --fresh --quiet 
https://github.com/apache/camel/blob/HEAD/dsl/camel-jbang/camel-jbang-main/dist/CamelJBang.java
diff --git a/karavan-builder/openshift/karavan-builder-task.yaml 
b/karavan-builder/openshift/karavan-builder-task.yaml
index 28346bf..f574a6e 100644
--- a/karavan-builder/openshift/karavan-builder-task.yaml
+++ b/karavan-builder/openshift/karavan-builder-task.yaml
@@ -19,11 +19,12 @@ spec:
           CHECKOUT_DIR="/scripts"
 
           git clone --depth 1 --branch main $(inputs.params.git) 
${CHECKOUT_DIR}
-
+          
           cd ${CHECKOUT_DIR}/$(inputs.params.project) 
 
           entrypoint -Dcamel.jbang.version=3.18.0-SNAPSHOT camel@apache/camel 
export
       
+          export LAST_COMMIT=$(git rev-parse --short HEAD)
           export TOKEN=$(cat 
/var/run/secrets/kubernetes.io/serviceaccount/token)
           /opt/mvnd/bin/mvnd package \
             -Dquarkus.container-image.build=true \
@@ -31,15 +32,13 @@ spec:
             -Dquarkus.container-image.insecure=true \
             -Dquarkus.container-image.username=sa \
             -Dquarkus.container-image.password=${TOKEN} \
+            
-Dquarkus.container-image.registry=image-registry.openshift-image-registry.svc:5000
 \
+            -Dquarkus.container-image.builder=jib \
             -Dquarkus.kubernetes-client.master-url=kubernetes.default.svc \
             -Dquarkus.kubernetes-client.token=${TOKEN} \
-            -Dquarkus.openshift.deployment-kind=Deployment \
             -Dquarkus.kubernetes.deploy=true \
-            
-Dquarkus.container-image.registry=image-registry.openshift-image-registry.svc:5000
 \
-            -Dquarkus.container-image.builder=jib \
             -Dquarkus.openshift.route.expose=true
-      image: 'entropy1/camel-karavan-builder:3.18.0-SNAPSHOT'
-      resources: {}
+      image: 'ghcr.io/apache/camel-karavan-builder:0.0.16'
       volumeMounts:
         - mountPath: /root/.m2
           name: m2-cache
@@ -51,6 +50,12 @@ spec:
             secretKeyRef:
               name: karavan-git-secret
               key: token
+    - name: rollout
+      image: >-
+        image-registry.openshift-image-registry.svc:5000/openshift/cli:latest
+      script: |
+        #!/usr/bin/env bash
+        oc rollout latest dc/$(inputs.params.project) 
   volumes:
     - name: m2-cache
       persistentVolumeClaim:

Reply via email to