Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions update.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ set -e

DOCKER_BUILD=${DOCKER_BUILD:-0}
DOCKER_PUSH=${DOCKER_PUSH:-0}
PODMAN_BUILD=${PODMAN_BUILD:-0}

BASE_DIR="$( cd "$(dirname "$0")" && pwd )"

Expand Down Expand Up @@ -99,6 +100,14 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do
"${dir}"
fi
fi

if [ "${PODMAN_BUILD}" = "1" ]; then
echo "Trying to build ${buildOptionTags} in '${dir}'"

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, can you just remove the debug output to stay consistent with the docker build step?


Another implementation idea would be to add a "CONTAINER_CMD" variable for example that will default to "docker". And since podman use the same convention as docker it would be a drop in replacement :

CONTAINER_CMD={$CONTAINER_CMD:docker}

// later on...

$CONTAINER_CMD build \
          --compress \
          ${buildOptionTags} \
          "${dir}"

The only thing that won't 100% work is everything related to "buildx". But in this case we can just keep the hardcoded "docker" call.

wdyt?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my immediate thought is that that buildx and podman would make some issues, so I'm more inclined to keep it as a separate build option - at least for now, also since I expect very few people to use it, and I want as few people as possible getting issues with podman which they might not even know what is

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me! Can you just remove the print output to stay consistent with the docker build?

podman build \
--compress \
${buildOptionTags} \
"${dir}"
fi
done

if [ "${dolibarrVersion}" = "develop" ]; then
Expand Down