Fix MacOS compatibility issues

container-tools · Feb 8, 2023 · d7ca1cf · d7ca1cf
1 parent 426f2bc
commit d7ca1cf
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 10 deletions.
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
@@ -135,7 +135,6 @@ jobs:
       matrix:
         knative_version:
         - v1.9.0
-        - v1.8.1
         os: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.os }}
     steps:

diff --git a/kind.sh b/kind.sh
@@ -49,6 +49,7 @@ main() {
 
     install_kind
     install_kubectl
+    install_docker
     create_kind_cluster
 
 }
@@ -169,6 +170,14 @@ install_kubectl() {
     kubectl version --client --output=yaml
 }
 
+install_docker() {
+    if [ "$RUNNER_OS" == "macOS" ] && ! [ -x "$(command -v docker)" ]; then
+        echo 'Installing docker...'
+        brew install docker colima
+        colima start
+    fi
+}
+
 create_kind_cluster() {
     echo 'Creating kind cluster...'
     local args=(create cluster "--name=$cluster_name" "--wait=$wait")

diff --git a/knative.sh b/knative.sh
@@ -105,8 +105,12 @@ parse_command_line() {
 
 install_prerequisites() {
     echo "Installing yq for patching Knative resources..."
-    wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq
-    chmod +x /usr/local/bin/yq
+    if [ "$RUNNER_OS" == "macOS" ]; then
+         brew install yq
+    else
+        wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O /usr/local/bin/yq
+        chmod +x /usr/local/bin/yq
+    fi
     yq --version
 }
 

diff --git a/main.sh b/main.sh
@@ -62,7 +62,7 @@ main() {
         args_knative+=(--knative-eventing "${INPUT_KNATIVE_EVENTING}")
     fi
 
-    if [[ -z "${INPUT_REGISTRY:-}" ]] || [[ "${INPUT_REGISTRY,,}" = "true" ]]; then
+    if [[ -z "${INPUT_REGISTRY:-}" ]] || [[ "$(echo ${INPUT_REGISTRY} | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
         if [[ ${args:+exist} == "exist" ]] && [[ ${#args[@]} -gt 0 ]]; then
             "$SCRIPT_DIR/registry.sh" "${args[@]}"
         else
@@ -82,7 +82,7 @@ main() {
         "$SCRIPT_DIR/kind.sh"
     fi
 
-    if [[ -z "${INPUT_REGISTRY:-}" ]] || [[ "${INPUT_REGISTRY,,}" = "true" ]]; then
+    if [[ -z "${INPUT_REGISTRY:-}" ]] || [[ "$(echo ${INPUT_REGISTRY} | tr '[:upper:]' '[:lower:]')" = "true" ]]; then
         if [[ ${args:+exist} == "exist" ]] && [[ ${#args[@]} -gt 0 ]]; then
             "$SCRIPT_DIR/registry.sh" "--document" "true" "${args[@]}"
         else

diff --git a/registry.sh b/registry.sh
@@ -46,6 +46,7 @@ main() {
 
     if [[ "$document" = "false" ]]
     then
+        install_docker
         create_registry
         connect_registry
         create_kind_config
@@ -121,16 +122,20 @@ parse_command_line() {
     done
 }
 
-create_registry() {
-    echo "Creating registry \"$registry_name\" on port $registry_port from image \"$registry_image\"..."
+install_docker() {
     if [ "$RUNNER_OS" == "macOS" ] && ! [ -x "$(command -v docker)" ]; then
-         brew install docker colima
-         colima start
+        echo 'Installing docker...'
+        brew install docker colima
+        colima start
     fi
+}
+
+create_registry() {
+    echo "Creating registry \"$registry_name\" on port $registry_port from image \"$registry_image\"..."
     docker run -d --restart=always -p "${registry_port}:5000" --name "${registry_name}" $registry_image > /dev/null
 
     # Adding registry to /etc/hosts
-    sudo -- bash -c 'echo "127.0.0.1 $registry_name" >> /etc/hosts'
+    echo "127.0.0.1 $registry_name" | sudo tee -a /etc/hosts
 
     # Exporting the registry location for subsequent jobs
     echo "KIND_REGISTRY=${registry_name}:${registry_port}" >> $GITHUB_ENV