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 6437f4ff Make Quinoa work (#629)
6437f4ff is described below
commit 6437f4ffadda9dad952d5fc89130006da3e8ee2e
Author: Andy Damevin <ia3a...@gmail.com>
AuthorDate: Fri Jan 20 16:31:52 2023 +0100
Make Quinoa work (#629)
---
.github/workflows/app.yml | 5 ++-
.gitignore | 1 +
karavan-app/pom.xml | 52 +++-------------------
karavan-app/src/main/resources/META-INF/.gitignore | 4 --
.../src/main/resources/application.properties | 8 ++--
karavan-app/src/main/webui/package.json | 3 +-
package-lock.json | 6 +++
7 files changed, 22 insertions(+), 57 deletions(-)
diff --git a/.github/workflows/app.yml b/.github/workflows/app.yml
index 95a22a23..b7918844 100644
--- a/.github/workflows/app.yml
+++ b/.github/workflows/app.yml
@@ -48,12 +48,13 @@ jobs:
- name: Karavan Core install
working-directory: ./karavan-core
- run: npm install
+ run: npm ci
# Build Karavan cloud app with public access
- name: Build application public
run: |
mvn package -f karavan-app -Dquarkus.profile=public -DskipTest \
+ -Dquarkus.quinoa.package-manager-install=false \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}:${{
env.TAG }} \
@@ -65,6 +66,7 @@ jobs:
- name: Build application basic auth
run: |
mvn package -f karavan-app -Dquarkus.profile=basic -DskipTest \
+ -Dquarkus.quinoa.package-manager-install=false \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-basic:${{ env.TAG
}} \
@@ -76,6 +78,7 @@ jobs:
- name: Build application oidc
run: |
mvn package -f karavan-app -Dquarkus.profile=oidc -DskipTest \
+ -Dquarkus.quinoa.package-manager-install=false \
-Dquarkus.container-image.build=true \
-Dquarkus.container-image.push=true \
-Dquarkus.container-image.image=ghcr.io/${GITHUB_REPOSITORY}-oidc:${{ env.TAG
}} \
diff --git a/.gitignore b/.gitignore
index 332e4856..ab2d8b70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -56,6 +56,7 @@ yarn-error.log*
**/*.vsix
**/*.bak
+.quinoa/
/karavan-core/lib/
diff --git a/karavan-app/pom.xml b/karavan-app/pom.xml
index 4d1325a1..0a39d887 100644
--- a/karavan-app/pom.xml
+++ b/karavan-app/pom.xml
@@ -144,11 +144,11 @@
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>io.quarkiverse.quinoa</groupId>-->
-<!-- <artifactId>quarkus-quinoa</artifactId>-->
-<!-- <version>1.2.2</version>-->
-<!-- </dependency>-->
+ <dependency>
+ <groupId>io.quarkiverse.quinoa</groupId>
+ <artifactId>quarkus-quinoa</artifactId>
+ <version>1.2.4</version>
+ </dependency>
</dependencies>
<build>
<resources>
@@ -165,48 +165,6 @@
</resource>
</resources>
<plugins>
- <plugin>
- <groupId>com.github.eirslett</groupId>
- <artifactId>frontend-maven-plugin</artifactId>
- <version>1.12.1</version>
- <configuration>
-
<workingDirectory>${project.basedir}/src/main/webui</workingDirectory>
- <installDirectory>target</installDirectory>
- </configuration>
- <executions>
- <execution>
- <id>install node and npm</id>
- <goals>
- <goal>install-node-and-npm</goal>
- </goals>
- <configuration>
- <nodeVersion>v18.12.1</nodeVersion>
- <npmVersion>9.1.1</npmVersion>
- </configuration>
- </execution>
- <execution>
- <id>npm install</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <arguments>install</arguments>
- </configuration>
- </execution>
- <execution>
- <id>npm run build</id>
- <goals>
- <goal>npm</goal>
- </goals>
- <configuration>
- <environmentVariables>
- <CI>false</CI>
- </environmentVariables>
- <arguments>run prod</arguments>
- </configuration>
- </execution>
- </executions>
- </plugin>
<plugin>
<groupId>${quarkus.platform.group-id}</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
diff --git a/karavan-app/src/main/resources/META-INF/.gitignore
b/karavan-app/src/main/resources/META-INF/.gitignore
deleted file mode 100644
index 5e7d2734..00000000
--- a/karavan-app/src/main/resources/META-INF/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# Ignore everything in this directory
-*
-# Except this file
-!.gitignore
diff --git a/karavan-app/src/main/resources/application.properties
b/karavan-app/src/main/resources/application.properties
index dd7327b3..d3413d23 100644
--- a/karavan-app/src/main/resources/application.properties
+++ b/karavan-app/src/main/resources/application.properties
@@ -91,6 +91,8 @@ quarkus.kubernetes-client.request-timeout=10000
quarkus.swagger-ui.always-include=true
-#quarkus.quinoa.package-manager-install=true
-#quarkus.quinoa.package-manager-install.node-version=18.12.1
-quarkus.quinoa.dev-server.port=3000
\ No newline at end of file
+quarkus.quinoa.frozen-lockfile=false
+quarkus.quinoa.package-manager-install=true
+quarkus.quinoa.package-manager-install.node-version=18.12.1
+quarkus.quinoa.dev-server.port=3000
+quarkus.quinoa.dev-server.check-timeout=60000
\ No newline at end of file
diff --git a/karavan-app/src/main/webui/package.json
b/karavan-app/src/main/webui/package.json
index 9ba62b8c..1210037d 100644
--- a/karavan-app/src/main/webui/package.json
+++ b/karavan-app/src/main/webui/package.json
@@ -5,8 +5,7 @@
"scripts": {
"copy-designer": "cp -r ../../../../karavan-designer/src/designer src &&
cp -r ../../../../karavan-designer/src/kamelets src && cp -r
../../../../karavan-designer/src/components src && cp -r
../../../../karavan-designer/src/eip src",
"start": "npm run copy-designer && react-scripts start",
- "build": "npm run copy-designer && react-scripts build",
- "prod": "npm run copy-designer && react-scripts build --dest && rsync -a
build/* ../resources/META-INF/resources"
+ "build": "npm run copy-designer && DISABLE_ESLINT_PLUGIN=true
react-scripts build"
},
"proxy": "http://127.0.0.1:8080/";,
"eslintConfig": {
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..42ea05f2
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,6 @@
+{
+ "name": "camel-karavan",
+ "lockfileVersion": 3,
+ "requires": true,
+ "packages": {}
+}
