You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2023/08/10 16:44:29 UTC
[camel-karavan] branch main updated: DevMode and Builder #855
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 3fb58f6e DevMode and Builder #855
3fb58f6e is described below
commit 3fb58f6e49e5ddb3c0e88d8a9df37985626868b9
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Aug 10 12:44:21 2023 -0400
DevMode and Builder #855
---
karavan-web/docker/Dockerfile.builder | 29 +++++++++++++++++++++--------
karavan-web/docker/Dockerfile.devmode | 1 -
2 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/karavan-web/docker/Dockerfile.builder b/karavan-web/docker/Dockerfile.builder
index a13c35ca..28266ff6 100644
--- a/karavan-web/docker/Dockerfile.builder
+++ b/karavan-web/docker/Dockerfile.builder
@@ -1,13 +1,26 @@
-FROM jbangdev/jbang-action:0.110.0
+FROM maven:3.9.3-eclipse-temurin-17-alpine
+LABEL "org.opencontainers.image.title"="karavan"
+LABEL "org.opencontainers.image.description"="Apache Camel Karavan DevMode"
+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"
+
+ENV JBANG_VERSION=0.110.0
ENV CAMEL_VERSION=4.0.0-RC2
+ENV KARAVAN="/karavan"
+ENV JBANG_REPO="$KARAVAN/.jbang/cache/.m2"
+ENV JBANG_DIR="$KARAVAN/.jbang"
ENV MAVEN_SETTINGS="/karavan-config-map/maven-settings.xml"
+ENV KAMELETS_DIR="/scripts/kamelets"
+ENV CHECKOUT_DIR="/scripts"
+ENV CODE_DIR="/code"
+ENV PATH="${PATH}:$KARAVAN/.jbang/bin"
-# 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
-
-# Add Maven
-RUN apt-get update -y && apt-get install maven git -y && apt-get clean
+RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
+ && apk update && apk add git \
+ && mkdir -p $CODE_DIR \
+ && jbang trust add --quiet https://github.com/apache/camel \
+ && jbang app install camel@apache/camel
-WORKDIR /scripts
-ENTRYPOINT ["entrypoint"]
+EXPOSE 8080
\ No newline at end of file
diff --git a/karavan-web/docker/Dockerfile.devmode b/karavan-web/docker/Dockerfile.devmode
index 84be4768..124730ed 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -20,7 +20,6 @@ ENV PATH="${PATH}:$KARAVAN/.jbang/bin"
RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
&& apk update && apk add git \
&& mkdir -p $CODE_DIR \
- # && mkdir -p $KAMELETS_DIR \
&& jbang trust add --quiet https://github.com/apache/camel \
&& jbang app install camel@apache/camel