From 684f58739848fb5cd2681d0d1c170ce669869c40 Mon Sep 17 00:00:00 2001 From: Pierre beucher Date: Wed, 31 Jul 2024 23:46:22 +0200 Subject: [PATCH] fix: simple docker build (no buildx) --- .github/workflows/test-install.yml | 2 +- cloudypad.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-install.yml b/.github/workflows/test-install.yml index 00075ba7..63cefce9 100644 --- a/.github/workflows/test-install.yml +++ b/.github/workflows/test-install.yml @@ -20,7 +20,7 @@ jobs: - ubuntu-20.04 # - macos-14 # Docker install suported yet # - macos-13 # Couldn't have a stable install of Docker on Mac yet, docker build keeps failing as if command is not recognized... - # - macos-12 + - macos-12 steps: - name: Checkout repository diff --git a/cloudypad.sh b/cloudypad.sh index 22d2a60f..8647154a 100755 --- a/cloudypad.sh +++ b/cloudypad.sh @@ -54,12 +54,12 @@ RUN if [ "$(id -u $HOST_UID)" -ne 0 ] >/dev/null 2>&1; then \ USER $HOST_UID EOF -container_build_output=$(docker buildx build -t $CLOUDYPAD_TARGET_IMAGE - < /tmp/Dockerfile-cloudypad-run 2>&1) +container_build_output=$(docker build -t $CLOUDYPAD_TARGET_IMAGE - < /tmp/Dockerfile-cloudypad-run 2>&1) container_build_result=$? if [ $container_build_result -ne 0 ]; then echo "Error: could not build CloudyPad container image, build exited with code: $container_build_result" >&2 - echo "Build command was: docker buildx build -t $CLOUDYPAD_TARGET_IMAGE - < /tmp/Dockerfile-cloudypad-run 2>&1" >&2 + echo "Build command was: docker build -t $CLOUDYPAD_TARGET_IMAGE - < /tmp/Dockerfile-cloudypad-run 2>&1" >&2 echo "Build output: " echo "$container_build_output" echo