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 5e326bd5 Prepare to release for #885
5e326bd5 is described below
commit 5e326bd5329bd7f7a6a04a765aac3dac681597c6
Author: Marat Gubaidullin <ma...@talismancloud.io>
AuthorDate: Mon Sep 18 12:53:50 2023 -0400
Prepare to release for #885
---
karavan-web/docker/Dockerfile.devmode | 7 ++++---
.../karavan-app/src/main/resources/snippets/openshift-build.sh | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/karavan-web/docker/Dockerfile.devmode
b/karavan-web/docker/Dockerfile.devmode
index b443fc95..b121ab25 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -18,16 +18,17 @@ ENV BUILDER_PATH="$KARAVAN/builder"
ENV CODE_DIR="$KARAVAN/code"
ENV KAMELETS_DIR="$CODE_DIR/kamelets"
ENV PATH="$PATH:$KARAVAN/.jbang/bin"
-ENV _JAVA_OPTIONS="-Duser.home=$KARAVAN"
RUN mkdir -p $JBANG_REPO \
&& mkdir -p $CODE_DIR \
&& mkdir -p $BUILDER_PATH
+RUN useradd -rm -d /karavan -s /bin/bash -g root -G sudo -u 1001 karavan
+RUN chown -R karavan $KARAVAN
+
RUN chgrp -R 0 $KARAVAN && chmod -R g+rwX $KARAVAN
-RUN git config --global --add safe.directory $CODE_DIR
-USER 1001
+USER karavan
RUN curl -Ls https://sh.jbang.dev | bash -s - app setup \
&& jbang trust add --quiet https://github.com/apache/camel \
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 6e45c838..f503fd17 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
@@ -1,4 +1,5 @@
#!/usr/bin/env bash
+ENV _JAVA_OPTIONS="-Duser.home=$KARAVAN"
if [[ ${GIT_REPOSITORY} == https* ]] ;
then
