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 0e89fc64 oidc github action
0e89fc64 is described below
commit 0e89fc64c9360c5cab9654276430860150211123
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Thu Feb 15 18:24:21 2024 -0500
oidc github action
---
.github/workflows/{app.yml => app-oidc.yml} | 36 ++--------------------
.github/workflows/app.yml | 34 ++------------------
.../src/main/resources/application.properties | 2 +-
3 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app-oidc.yml
similarity index 51%
copy from .github/workflows/app.yml
copy to .github/workflows/app-oidc.yml
index ca0d1b22..652ade0f 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app-oidc.yml
@@ -52,44 +52,14 @@ jobs:
working-directory: ./karavan/karavan-core
run: npm ci
- # Build Karavan web app with public access
- - name: Build application public
+ - name: Build application
working-directory: ./karavan/karavan-web/karavan-app
run: |
- mvn package -Dquarkus.profile=public -DskipTests \
+ mvn package -Dquarkus.profile=oidc -DskipTests \
-Dquarkus.quinoa.package-manager-install=false \
-Dquarkus.container-image.build=true \
- -Dquarkus.container-image.builder=jib \
- -Dquarkus.jib.platforms=linux/amd64,linux/arm64 \
-
-Dquarkus.jib.base-native-image=quay.io/quarkus/quarkus-micro-image:latest \
-Dquarkus.container-image.push=true \
- -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}:${{ env.TAG }} \
+ -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}:${{ env.TAG }}-oidc \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
if: ${{ github.ref == 'refs/heads/main' }}
-
- # Build Karavan web app with basic authorization
- # - name: Build application basic auth
- # working-directory: ./karavan/karavan-web/karavan-app
- # run: |
- # mvn package -Dquarkus.profile=basic -DskipTests \
- # -Dquarkus.quinoa.package-manager-install=false \
- # -Dquarkus.container-image.build=true \
- # -Dquarkus.container-image.push=true \
- # -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}-basic:${{ env.TAG }} \
- # -Dquarkus.container-image.username=${{ github.actor }} \
- # -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
- # if: ${{ github.ref == 'refs/heads/main' }}
-
- # Build Karavan web app with oidc authorization
- # - name: Build application oidc
- # working-directory: ./karavan/karavan-web/karavan-app
- # run: |
- # mvn package -Dquarkus.profile=oidc -DskipTests \
- # -Dquarkus.quinoa.package-manager-install=false \
- # -Dquarkus.container-image.build=true \
- # -Dquarkus.container-image.push=true \
- # -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}-oidc:${{ env.TAG }} \
- # -Dquarkus.container-image.username=${{ github.actor }} \
- # -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
- # if: ${{ github.ref == 'refs/heads/main' }}
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index ca0d1b22..d37bf795 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -52,44 +52,14 @@ jobs:
working-directory: ./karavan/karavan-core
run: npm ci
- # Build Karavan web app with public access
- - name: Build application public
+ - name: Build application
working-directory: ./karavan/karavan-web/karavan-app
run: |
mvn package -Dquarkus.profile=public -DskipTests \
-Dquarkus.quinoa.package-manager-install=false \
-Dquarkus.container-image.build=true \
- -Dquarkus.container-image.builder=jib \
- -Dquarkus.jib.platforms=linux/amd64,linux/arm64 \
-
-Dquarkus.jib.base-native-image=quay.io/quarkus/quarkus-micro-image:latest \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}:${{ env.TAG }} \
-Dquarkus.container-image.username=${{ github.actor }} \
-Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
- if: ${{ github.ref == 'refs/heads/main' }}
-
- # Build Karavan web app with basic authorization
- # - name: Build application basic auth
- # working-directory: ./karavan/karavan-web/karavan-app
- # run: |
- # mvn package -Dquarkus.profile=basic -DskipTests \
- # -Dquarkus.quinoa.package-manager-install=false \
- # -Dquarkus.container-image.build=true \
- # -Dquarkus.container-image.push=true \
- # -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}-basic:${{ env.TAG }} \
- # -Dquarkus.container-image.username=${{ github.actor }} \
- # -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
- # if: ${{ github.ref == 'refs/heads/main' }}
-
- # Build Karavan web app with oidc authorization
- # - name: Build application oidc
- # working-directory: ./karavan/karavan-web/karavan-app
- # run: |
- # mvn package -Dquarkus.profile=oidc -DskipTests \
- # -Dquarkus.quinoa.package-manager-install=false \
- # -Dquarkus.container-image.build=true \
- # -Dquarkus.container-image.push=true \
- # -Dquarkus.container-image.image=${{ env.REGISTRY
}}/${GITHUB_REPOSITORY}-oidc:${{ env.TAG }} \
- # -Dquarkus.container-image.username=${{ github.actor }} \
- # -Dquarkus.container-image.password=${{ secrets.GITHUB_TOKEN }}
- # if: ${{ github.ref == 'refs/heads/main' }}
+ if: ${{ github.ref == 'refs/heads/main' }}
\ No newline at end of file
diff --git a/karavan-web/karavan-app/src/main/resources/application.properties
b/karavan-web/karavan-app/src/main/resources/application.properties
index b03e514e..da423a05 100644
--- a/karavan-web/karavan-app/src/main/resources/application.properties
+++ b/karavan-web/karavan-app/src/main/resources/application.properties
@@ -112,7 +112,7 @@ quarkus.keycloak.devservices.enabled=false
%basic.quarkus.http.auth.permission.public.enabled=true
%basic.quarkus.security.users.embedded.enabled=true
%basic.quarkus.security.users.embedded.plain-text=true
-%basic.quarkus.security.users.embedded.users.admin=${master-password}
+%basic.quarkus.security.users.embedded.users.admin=karavan
%basic.quarkus.security.users.embedded.roles.admin=administrator,developer
# Quarkus configuration
