You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/02/01 16:08:28 UTC
[camel-k] 01/02: fix(OLM): Fix OLM bundle Dockerfile
post-processing on Mac OS
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit cf9873c77e090e46f99e49389dc5151765113928
Author: Antonin Stefanutti <an...@stefanutti.fr>
AuthorDate: Mon Feb 1 16:11:45 2021 +0100
fix(OLM): Fix OLM bundle Dockerfile post-processing on Mac OS
---
script/Makefile | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/script/Makefile b/script/Makefile
index 217e2d5..7fa7024 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -339,7 +339,11 @@ bundle: generate-crd $(BUNDLE_CAMEL_APIS)
@# Build kustomize manifests
$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle --overwrite --version $(OPERATOR_VERSION) $(BUNDLE_METADATA_OPTS)
@# Move the dockerfile into the bundle directory
+ifneq ($(uname -s 2>/dev/null || echo Unknown),Darwin)
+ mv bundle.Dockerfile bundle/Dockerfile && sed -i '.bak' 's/bundle\///g' bundle/Dockerfile
+else
mv bundle.Dockerfile bundle/Dockerfile && sed -i 's/bundle\///g' bundle/Dockerfile
+endif
@# Adds the licence headers to the csv file
./script/add_license.sh bundle/manifests ./script/headers/yaml.txt
@#operator-sdk bundle validate ./bundle