You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2024/01/18 12:02:06 UTC
(camel-k) branch main updated (cdda1dd63 -> 679c040c1)
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
from cdda1dd63 chore(deps): bump github.com/onsi/gomega from 1.30.0 to 1.31.0
new eb9b03b28 fix(ci): workaround to avoid mac DNS problems
new 679c040c1 fix(ci): use docker buildx which should be available on mac as well
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:
.github/actions/kamel-build-binary/build-binary.sh | 6 ++++++
.github/actions/kamel-config-cluster-kind/action.yml | 2 +-
script/Makefile | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
(camel-k) 02/02: fix(ci): use docker buildx which should be available on mac as well
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 679c040c16ffe8da54f16fc5612317e26c946be2
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Thu Jan 18 09:35:01 2024 +0100
fix(ci): use docker buildx which should be available on mac as well
---
.github/actions/kamel-config-cluster-kind/action.yml | 2 +-
script/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/actions/kamel-config-cluster-kind/action.yml b/.github/actions/kamel-config-cluster-kind/action.yml
index 4bcfcb37e..590ad4c99 100644
--- a/.github/actions/kamel-config-cluster-kind/action.yml
+++ b/.github/actions/kamel-config-cluster-kind/action.yml
@@ -23,7 +23,7 @@ runs:
steps:
- id: install-cluster
name: Install Cluster
- uses: container-tools/kind-action@v2.0.2
+ uses: container-tools/kind-action@v2.0.3
if: ${{ env.CLUSTER_KIND_CONFIGURED != 'true' }}
with:
version: v0.19.0
diff --git a/script/Makefile b/script/Makefile
index e9d67ef14..3d1adbcce 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -449,7 +449,7 @@ ifneq (,$(findstring SNAPSHOT,$(DEFAULT_RUNTIME_VERSION)))
endif
@echo "####### Building Camel K operator arch $(IMAGE_ARCH) container image..."
mkdir -p build/_maven_output
- docker build --target $(TARGET_STAGE) --platform=linux/$(IMAGE_ARCH) -t $(DOCKER_TAG) -f build/Dockerfile .
+ docker buildx build --target $(TARGET_STAGE) --platform=linux/$(IMAGE_ARCH) -t $(DOCKER_TAG) -f build/Dockerfile .
# Mainly used for internal CI purposes
image-push:
(camel-k) 01/02: fix(ci): workaround to avoid mac DNS problems
Posted by pc...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit eb9b03b2821cc9859bb7c6a243c0a68af0524c5f
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Jan 17 18:38:09 2024 +0100
fix(ci): workaround to avoid mac DNS problems
---
.github/actions/kamel-build-binary/build-binary.sh | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/.github/actions/kamel-build-binary/build-binary.sh b/.github/actions/kamel-build-binary/build-binary.sh
index bd80a1799..fc90e183b 100755
--- a/.github/actions/kamel-build-binary/build-binary.sh
+++ b/.github/actions/kamel-build-binary/build-binary.sh
@@ -68,6 +68,12 @@ if [ -n "${REGISTRY_PUSH_HOST}" ]; then
# for docker to push the image.
#
export CUSTOM_IMAGE=${REGISTRY_PUSH_HOST}/${IMAGE_NAMESPACE}/camel-k
+
+ # TODO remove as soon as the issue is fixed
+ # https://github.com/actions/runner-images/issues/8649
+ if [ "$RUNNER_OS" == "macOS" ]; then
+ export CUSTOM_IMAGE="127.0.0.1:5000/${IMAGE_NAMESPACE}/camel-k"
+ fi
fi
if [ -n "${DEBUG_USE_EXISTING_IMAGE}" ] && [ -n "${CUSTOM_IMAGE}" ]; then