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 6ff9e775 Prepare to work in Openshift for #885
6ff9e775 is described below
commit 6ff9e775aaf3e0d313d42a78a635e5e9e9e17be1
Author: Marat Gubaidullin <[email protected]>
AuthorDate: Sat Sep 16 18:41:19 2023 -0400
Prepare to work in Openshift for #885
---
karavan-web/docker/Dockerfile.devmode | 22 ++++++-------------
.../src/main/resources/snippets/docker-build.sh | 10 ++++-----
.../main/resources/snippets/kubernetes-build.sh | 10 ++++-----
.../src/main/resources/snippets/openshift-build.sh | 25 ++++++++++++----------
4 files changed, 29 insertions(+), 38 deletions(-)
diff --git a/karavan-web/docker/Dockerfile.devmode
b/karavan-web/docker/Dockerfile.devmode
index fee574f4..62323e8d 100644
--- a/karavan-web/docker/Dockerfile.devmode
+++ b/karavan-web/docker/Dockerfile.devmode
@@ -1,6 +1,6 @@
FROM maven:3.9.3-eclipse-temurin-17
-LABEL "org.opencontainers.image.title"="karavan"
+LABEL "org.opencontainers.image.title"="karavan-devmode"
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"
@@ -10,31 +10,23 @@ ENV JBANG_VERSION=0.110.0
ENV CAMEL_VERSION=4.0.0
ENV DOT_CAMEL="/.camel"
ENV KARAVAN="/karavan"
-ENV BUILDER_PATH="/builder"
+ENV BUILDER_PATH="$KARAVAN/builder"
ENV JBANG_REPO="$KARAVAN/.jbang/cache/.m2"
ENV JBANG_DIR="$KARAVAN/.jbang"
ENV MAVEN_SETTINGS="/karavan-config-map/maven-settings.xml"
ENV MAVEN_CONFIG="$KARAVAN/.m2"
-ENV KAMELETS_DIR="/code/kamelets"
-ENV CHECKOUT_DIR="/code"
-ENV CODE_DIR="/code"
-ENV CHECKOUT_DIR="/scripts"
-ENV KAMELETS_DIR="/scripts/kamelets"
+ENV CODE_DIR="$KARAVAN/code"
+ENV KAMELETS_DIR="$KARAVAN/code/kamelets"
ENV PATH="${PATH}:$KARAVAN/.jbang/bin"
RUN apt-get update && apt-get install git && apt-get clean
-RUN mkdir -p $CODE_DIR \
- && mkdir -p $DOT_CAMEL \
+RUN mkdir -p $DOT_CAMEL \
&& mkdir -p $KARAVAN \
+ && mkdir -p $CODE_DIR \
&& mkdir -p $BUILDER_PATH \
- && mkdir -p $JBANG_REPO \
- && mkdir -p $KAMELETS_DIR
+ && mkdir -p $JBANG_REPO
RUN chgrp -R 0 $KARAVAN && chmod -R g=u $KARAVAN
-RUN chgrp -R 0 $DOT_CAMEL && chmod -R g=u $DOT_CAMEL
-RUN chgrp -R 0 $BUILDER_PATH && chmod -R g=u $BUILDER_PATH
-RUN chgrp -R 0 $CODE_DIR && chmod -R g=u $CODE_DIR
-RUN chgrp -R 0 $CHECKOUT_DIR && chmod -R g=u $CHECKOUT_DIR
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/docker-build.sh
b/karavan-web/karavan-app/src/main/resources/snippets/docker-build.sh
index 7404231d..85b56172 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
@@ -1,24 +1,22 @@
#!/usr/bin/env bash
-CHECKOUT_DIR="/scripts"
-KAMELETS_DIR="/scripts/kamelets"
if [[ ${GIT_REPOSITORY} == https* ]] ;
then
replacer=https://${GIT_USERNAME}:${GIT_PASSWORD}@
prefix=https://
url="${GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
elif [[ ${GIT_REPOSITORY} == http* ]] ;
then
replacer=http://${GIT_USERNAME}:${GIT_PASSWORD}@
prefix=http://
url="${GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
else
- git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY}
${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CODE_DIR}
fi
-cd ${CHECKOUT_DIR}/${PROJECT_ID}
+cd ${CODE_DIR}/${PROJECT_ID}
jbang -Dcamel.jbang.version=${CAMEL_VERSION} camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
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 667e66c2..89044330 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
@@ -1,24 +1,22 @@
#!/usr/bin/env bash
-CHECKOUT_DIR="/scripts"
-KAMELETS_DIR="/scripts/kamelets"
if [[ ${GIT_REPOSITORY} == https* ]] ;
then
replacer=https://${GIT_USERNAME}:${GIT_PASSWORD}@
prefix=https://
url="${GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
elif [[ ${GIT_REPOSITORY} == http* ]] ;
then
replacer=http://${GIT_USERNAME}:${GIT_PASSWORD}@
prefix=http://
url="${GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
else
- git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY}
${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CODE_DIR}
fi
-cd ${CHECKOUT_DIR}/${PROJECT_ID}
+cd ${CODE_DIR}/${PROJECT_ID}
jbang -Dcamel.jbang.version=${CAMEL_VERSION} camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
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 ebad0494..4ddce9a0 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,20 +1,24 @@
#!/usr/bin/env bash
-CHECKOUT_DIR="/scripts"
-KAMELETS_DIR="/scripts/kamelets"
-if [[ $GIT_REPOSITORY == https* ]] ;
+if [[ ${GIT_REPOSITORY} == https* ]] ;
then
- replacer=https://$GIT_USERNAME:$GIT_PASSWORD@
+ replacer=https://${GIT_USERNAME}:${GIT_PASSWORD}@
prefix=https://
url="${GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
+elif [[ ${GIT_REPOSITORY} == http* ]] ;
+then
+ replacer=http://${GIT_USERNAME}:${GIT_PASSWORD}@
+ prefix=http://
+ url="${GIT_REPOSITORY/$prefix/$replacer}"
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CODE_DIR}
else
- git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY}
${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CODE_DIR}
fi
-cd ${CHECKOUT_DIR}/$(inputs.params.project)
+cd ${CODE_DIR}/${PROJECT_ID}
-jbang -Dcamel.jbang.version=$CAMEL_VERSION camel@apache/camel export
--local-kamelet-dir=${KAMELETS_DIR}
+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=$(date '+%Y%m%d%H%M%S')
@@ -24,7 +28,6 @@ export NAMESPACE=$(cat
/var/run/secrets/kubernetes.io/serviceaccount/namespace)
mvn package jib:build oc:resource oc:apply \
-Djkube.namespace=${NAMESPACE} \
-Djib.allowInsecureRegistries=true \
-
-Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/$(inputs.params.project):${DATE}
\
+ -Djib.to.image=${IMAGE_REGISTRY}/${IMAGE_GROUP}/${PROJECT_ID}:${DATE} \
-Djib.to.auth.username=${IMAGE_REGISTRY_USERNAME} \
- -Djib.to.auth.password=${IMAGE_REGISTRY_PASSWORD} \
- --settings=$MAVEN_SETTINGS
\ No newline at end of file
+ -Djib.to.auth.password=${IMAGE_REGISTRY_PASSWORD}
