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 d64778f5 Prepare to release for #885
d64778f5 is described below
commit d64778f5a8a2144b2fb24dc642c71e8a59f638c1
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Sep 18 12:06:09 2023 -0400
Prepare to release for #885
---
karavan-web/karavan-app/src/main/docker/Dockerfile.jdk | 8 ++++++++
.../main/java/org/apache/camel/karavan/api/ContainerResource.java | 2 +-
.../karavan-app/src/main/resources/snippets/docker-build.sh | 5 +----
.../karavan-app/src/main/resources/snippets/kubernetes-build.sh | 4 +---
.../karavan-app/src/main/resources/snippets/openshift-build.sh | 4 +---
.../karavan-app/src/main/webui/src/templates/TemplatesPage.tsx | 2 +-
6 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
index 212a1cde..2022efbc 100644
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
+++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.jdk
@@ -1,4 +1,12 @@
FROM eclipse-temurin:17-jdk
+
+LABEL "org.opencontainers.image.title"="karavan"
+LABEL "org.opencontainers.image.description"="Apache Camel Karavan"
+LABEL "org.opencontainers.image.url"="https://camel.apache.org";
+LABEL "org.opencontainers.image.licenses"="Apache 2.0"
+LABEL "org.opencontainers.image.version"="4.0.0-RC2"
+LABEL "org.apache.camel.karavan/type"="internal"
+
RUN mkdir /opt/app
COPY target/*-runner.jar /opt/app/karavan.jar
ENV JAVA_OPTS="-Dquarkus.http.host=0.0.0.0
-Djava.util.logging.manager=org.jboss.logmanager.LogManager"
diff --git
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
index 178e987c..a288a2a7 100644
---
a/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
+++
b/karavan-web/karavan-app/src/main/java/org/apache/camel/karavan/api/ContainerResource.java
@@ -98,7 +98,7 @@ public class ContainerResource {
String code = projectService.getDevServiceCode();
DockerComposeService dockerComposeService =
DockerComposeConverter.fromCode(code, name);
if (dockerComposeService != null) {
-
dockerService.createContainerFromCompose(dockerComposeService,
ContainerStatus.ContainerType.devmode);
+
dockerService.createContainerFromCompose(dockerComposeService,
ContainerStatus.ContainerType.devservice);
dockerService.runContainer(dockerComposeService.getContainer_name());
}
} else if (Objects.equals(type,
ContainerStatus.ContainerType.project.name())) {
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/docker-build.sh
b/karavan-web/karavan-app/src/main/resources/snippets/docker-build.sh
index 85b56172..319d5383 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/docker-build.sh
+++ b/karavan-web/karavan-app/src/main/resources/snippets/docker-build.sh
@@ -20,11 +20,8 @@ cd ${CODE_DIR}/${PROJECT_ID}
jbang -Dcamel.jbang.version=${CAMEL_VERSION} camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
-export LAST_COMMIT=$(git rev-parse --short HEAD)
-export DATE=${TAG}
-
mvn package jib:build \
-Djib.allowInsecureRegistries=true \
- -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${DATE} \
+ -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${TAG} \
-Djib.to.auth.username=${IMAGE_REGISTRY_USERNAME} \
-Djib.to.auth.password=${IMAGE_REGISTRY_PASSWORD}
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-build.sh
b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-build.sh
index 89044330..bbfffbb0 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-build.sh
+++ b/karavan-web/karavan-app/src/main/resources/snippets/kubernetes-build.sh
@@ -20,14 +20,12 @@ cd ${CODE_DIR}/${PROJECT_ID}
jbang -Dcamel.jbang.version=${CAMEL_VERSION} camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
-export LAST_COMMIT=$(git rev-parse --short HEAD)
-export DATE=${TAG}
export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
mvn package jib:build k8s:resource k8s:apply \
-Djkube.namespace=${NAMESPACE} \
-Djib.allowInsecureRegistries=true \
- -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${DATE} \
+ -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${TAG} \
-Djib.to.auth.username=${IMAGE_REGISTRY_USERNAME} \
-Djib.to.auth.password=${IMAGE_REGISTRY_PASSWORD}
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
b/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
index fa2854d3..6e45c838 100644
--- a/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
+++ b/karavan-web/karavan-app/src/main/resources/snippets/openshift-build.sh
@@ -20,8 +20,6 @@ cd ${CODE_DIR}/${PROJECT_ID}
jbang -Dcamel.jbang.version=${CAMEL_VERSION} camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
-export LAST_COMMIT=$(git rev-parse --short HEAD)
-export DATE=${TAG}
export CERT=$(cat /var/run/secrets/kubernetes.io/serviceaccount/service-ca.crt)
export TOKEN=$(cat /var/run/secrets/kubernetes.io/serviceaccount/token)
export NAMESPACE=$(cat /var/run/secrets/kubernetes.io/serviceaccount/namespace)
@@ -31,6 +29,6 @@ sed -i 's/kubernetes-maven-plugin/openshift-maven-plugin/g'
pom.xml
mvn package jib:build oc:resource oc:apply \
-Djkube.namespace=${NAMESPACE} \
-Djib.allowInsecureRegistries=true \
- -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${DATE} \
+ -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${TAG} \
-Djib.to.auth.username=${TOKEN} \
-Djib.to.auth.password=${TOKEN}
\ No newline at end of file
diff --git
a/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesPage.tsx
b/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesPage.tsx
index 94371de7..9a71352b 100644
--- a/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesPage.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/templates/TemplatesPage.tsx
@@ -56,7 +56,7 @@ export function TemplatesPage () {
function title() {
return <TextContent>
- <Text component="h2">Projects</Text>
+ <Text component="h2">Templates</Text>
</TextContent>
}
