Compare commits

...

3 Commits

Author SHA1 Message Date
a74f81c399 Change how builds are made 2023-10-08 18:00:37 +02:00
9c7f2ebfbc Merge branch 'tool_synapse-compress-state' 2023-10-08 18:00:08 +02:00
8c067f59ff Make synapse_auto_compressor default 2023-10-08 17:59:53 +02:00
4 changed files with 44 additions and 22 deletions

View File

@ -2,8 +2,7 @@
PLATFORM=${PLATFORM:-"linux/amd64,linux/arm64/v8,linux/arm/v7"} PLATFORM=${PLATFORM:-"linux/amd64,linux/arm64/v8,linux/arm/v7"}
docker buildx build \ docker buildx build \
--platform $PLATFORM \ --platform $PLATFORM \
--tag $TAG:latest \ $TAGS_ARG \
--tag "${TAG}:${VERSION}" \ $EXTRA_ARGS \
$EXTRA_ARGS \ $WORKDIR
$WORKDIR

View File

@ -1,7 +1,6 @@
#!/bin/bash #!/bin/bash
docker build \ docker build \
--tag $TAG:latest \ $TAGS_ARG \
--tag $TAG:$VERSION \ $EXTRA_ARGS \
$EXTRA_ARGS \ "$WORKDIR"
"$WORKDIR"

View File

@ -24,32 +24,56 @@ fi
cd "$repositoryFolder" cd "$repositoryFolder"
if [ "$cloned" != True ]; then if [ "$cloned" != True ]; then
# Checkout default-branch in case GIT_CHECKOUT was different # Checkout default-branch in case GIT_CHECKOUT was different
defaultBranch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@') defaultBranch=$(git symbolic-ref refs/remotes/origin/HEAD | sed 's@^refs/remotes/origin/@@')
git checkout "${defaultBranch}" git checkout "${defaultBranch}"
git pull # Get changes git pull # Get changes
fi fi
# Checkout when set # Checkout when set
if [ "$GIT_CHECKOUT" != "" ]; then if [ "$GIT_CHECKOUT" != "" ]; then
# Handle special directives # Handle special directives
if [ "$GIT_CHECKOUT" = "latest-tag" ]; then if [ "$GIT_CHECKOUT" = "latest-tag" ]; then
GIT_CHECKOUT=$(git describe --tags `git rev-list --tags --max-count=1`) # Get latest tag GIT_CHECKOUT=$(git describe --tags $(git rev-list --tags --max-count=1)) # Get latest tag
fi fi
git checkout $GIT_CHECKOUT git checkout $GIT_CHECKOUT
fi fi
# --- VERSION --- # --- VERSION ---
# Get current version to build # When not set
VERSION=$(git describe --tags --long) if [ "$GIT_CHECKOUT" == "" ]; then
if [ $? -ne 0 ]; then # Get current version to build
VERSION=$(git rev-parse HEAD) VERSION=$(git describe --tags --long)
if [ $? -ne 0 ]; then
VERSION=$(git rev-parse HEAD)
fi
export VERSION
fi fi
export VERSION
printf "Version: ${VERSION}\n" printf "Version: ${VERSION}\n"
TAG=${TAG:-"${TAGPREFIX}${NAME}"} # --- TAGS ---
printf "> ${TAG}\n" IFS='-.' read -ra ADDR <<<"$VERSION"
TAG_VERS=("latest")
currentTag="${ADDR[0]}"
TAG_VERS+=("$currentTag")
for i in $(seq 1 $((${#ADDR[@]} - 1))); do
delimiter="."
if [[ $VERSION == *"${currentTag}-${ADDR[$i]}"* ]]; then
delimiter="-"
fi
currentTag="${currentTag}${delimiter}${ADDR[$i]}"
TAG_VERS+=("$currentTag")
done
# Generate TAG_VERS_ARG
printf "TAG_VERS:\n"
for tag_ver in "${TAG_VERS[@]}"; do
TAG="${TAGPREFIX}${NAME}:${tag_ver}"
TAGS_ARG="$TAGS_ARG --tag $TAG"
echo "- $TAG"
done

View File

@ -29,4 +29,4 @@ FROM base AS release
COPY --from=build-synapse_compress-state /build/target/release/synapse_compress_state . COPY --from=build-synapse_compress-state /build/target/release/synapse_compress_state .
COPY --from=build-synapse_auto_compressor /build/target/release/synapse_auto_compressor . COPY --from=build-synapse_auto_compressor /build/target/release/synapse_auto_compressor .
ENTRYPOINT ["./synapse_compress_state"] ENTRYPOINT ["./synapse_auto_compressor"]