Skip to content

Commit

Permalink
fix: missing builder 3
Browse files Browse the repository at this point in the history
  • Loading branch information
rimelek committed Jul 21, 2022
1 parent 0ee4166 commit f21f0ce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
3 changes: 1 addition & 2 deletions ci/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export CI_EVENT_TYPE=""
export CI_REPOSITORY_ALIAS="origin"
export CI_REPOSITORY_URL=""
export CI_BUILD_NUMBER="$GIT_HASH"
export CI_PLATFORMS="linux/amd64,linux/arm/v8"
export CI_PARENT_IMAGE="httpd:2.4"

while getopts ":t:b:i:e:r:R:B:p:dh" opt; do
Expand All @@ -39,7 +38,7 @@ while getopts ":t:b:i:e:r:R:B:p:dh" opt; do
esac
;;
h)
echo "Usage: $0 [-t <string>] [-b <string>] [-i <string>] [-e <string>] [-r <string>] [-d] [-s] [-h]"
echo "Usage: $0 [-t <string>] [-b <string>] [-i <string>] [-e <string>] [-r <string>] [-R <string>] [-B <string>] [-p <string>] [-d] [-s] [-h]"
echo "Options:"
echo -e "\t-t <string>\tGit commit tag if the build was triggered by tag. Do not use it anyway!"
echo -e "\t-b <string>\tGit branch if the build was triggered by branch. If \"-t\" was given too, \"-b\" will always be ignored!"
Expand Down
2 changes: 2 additions & 0 deletions ci/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ while getopts ":t:b:i:I:e:B:dh" opt; do
i) CI_IMAGE_NAME="$OPTARG" ;;
I) CI_IMAGE_NAME_ALTERNATIVE="$OPTARG" ;;
B) CI_BUILD_NUMBER="$OPTARG" ;;
p) CI_PLATFORMS="$OPTARG" ;;
e)
case "$OPTARG" in
push | api | cron) CI_EVENT_TYPE="$OPTARG" ;;
Expand All @@ -39,6 +40,7 @@ while getopts ":t:b:i:I:e:B:dh" opt; do
echo -e "\t-I <string>\tAlternative Docker image name without version tag. Can be used to push to a second repository."
echo -e "\t-e <string>\tEvent type. Valid types: "
echo -e "\t-B <string>\tBuild number. git commit hash by default"
echo -e "\t-p <string>\t List of platforms like: -p linux/amd64,linux/arm/v8"
echo -e "\t-h\t\tShows this help message"
exit 0
;;
Expand Down
3 changes: 2 additions & 1 deletion ci/resources.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ GIT_HASH="$(git rev-list -n 1 HEAD)"
PATTERN_MINOR_BRANCH='^\([0-9]\+\.[0-9]\+\)\(-dev\)\?$'
PATTERN_STABLE_VERSION='[0-9]\+\.[0-9]\+\.[0-9]\+'
PARENT_IMAGE="httpd:2.4"
export CI_PLATFORMS="linux/amd64,linux/arm/v8"

function get_current_time() {
date +'%Y-%m-%d %H:%M:%S %Z'
Expand Down Expand Up @@ -357,7 +358,7 @@ function docker_tag() {
done

write_info "Deploy command: "
write_info "${command[@]}"
write_info "${command[*]}"

"${command[@]}"
}
Expand Down

0 comments on commit f21f0ce

Please sign in to comment.