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/01 22:43:21 UTC
[camel-karavan] branch main updated (87b4e926 -> c03ebc5d)
This is an automated email from the ASF dual-hosted git repository.
marat pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
from 87b4e926 Fixed #841
new f9972b0e Fixed #841
new c03ebc5d Set correct Base Images #834
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
karavan-web/karavan-app/src/main/docker/Dockerfile.distroless | 2 +-
.../main/webui/src/designer/route/property/ComponentParameterField.tsx | 2 +-
karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
[camel-karavan] 01/02: Fixed #841
Posted by ma...@apache.org.
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
commit f9972b0e0157aeddcca5378d9e7b50da9b4ee239
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Aug 1 18:42:08 2023 -0400
Fixed #841
---
.../main/webui/src/designer/route/property/ComponentParameterField.tsx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
index ca1f6a0d..e0a6f99f 100644
--- a/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
+++ b/karavan-web/karavan-app/src/main/webui/src/designer/route/property/ComponentParameterField.tsx
@@ -139,7 +139,7 @@ export class ComponentParameterField extends React.Component<Props, State> {
const internalUris = CamelUi.getInternalRouteUris(this.props.integration, componentName, false);
const uris: string [] = [];
uris.push(...internalUris);
- if (value.length > 0 && !uris.includes(value)) {
+ if (value && value.length > 0 && !uris.includes(value)) {
uris.unshift(value);
}
if (uris && uris.length > 0) {
[camel-karavan] 02/02: Set correct Base Images #834
Posted by ma...@apache.org.
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
commit c03ebc5da7069661288f9768e86e4279cbb0e472
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Tue Aug 1 18:43:11 2023 -0400
Set correct Base Images #834
---
karavan-web/karavan-app/src/main/docker/Dockerfile.distroless | 2 +-
karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless b/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
index 87155a0e..d8e8f265 100644
--- a/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
+++ b/karavan-web/karavan-app/src/main/docker/Dockerfile.distroless
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM gcr.io/distroless/java:17
+FROM gcr.io/distroless/java17@sha256:3a4ea21bd7b412b8b6ae61313b39337d8f03bb6844013810e8e4625d8c765edb
COPY target/*-runner.jar /deployments/karavan.jar
WORKDIR /deployments
CMD ["karavan.jar"]
\ No newline at end of file
diff --git a/karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless b/karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless
index 8cc8ea15..d8e8f265 100644
--- a/karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless
+++ b/karavan-web/karavan-headless/src/main/docker/Dockerfile.distroless
@@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-FROM gcr.io/distroless/java17@sha256:052076466984fd56979c15a9c3b7433262b0ad9aae55bc0c53d1da8ffdd829c3
+FROM gcr.io/distroless/java17@sha256:3a4ea21bd7b412b8b6ae61313b39337d8f03bb6844013810e8e4625d8c765edb
COPY target/*-runner.jar /deployments/karavan.jar
WORKDIR /deployments
CMD ["karavan.jar"]
\ No newline at end of file