Add buildoptions

This commit is contained in:
Lars Gohr
2019-12-19 21:12:59 +01:00
parent f1df09237f
commit a72734e157
3 changed files with 46 additions and 6 deletions

View File

@@ -100,13 +100,13 @@ function changeWorkingDirectory() {
}
function useCustomDockerfile() {
BUILDPARAMS="$BUILDPARAMS -f ${INPUT_DOCKERFILE}"
BUILDPARAMS="${BUILDPARAMS} -f ${INPUT_DOCKERFILE}"
}
function addBuildArgs() {
for arg in $(echo "${INPUT_BUILDARGS}" | tr ',' '\n'); do
BUILDPARAMS="$BUILDPARAMS --build-arg ${arg}"
echo "::add-mask::${arg}"
for ARG in $(echo "${INPUT_BUILDARGS}" | tr ',' '\n'); do
BUILDPARAMS="${BUILDPARAMS} --build-arg ${ARG}"
echo "::add-mask::${ARG}"
done
}
@@ -129,14 +129,14 @@ function pushWithSnapshot() {
local SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-6)
local SNAPSHOT_TAG="${TIMESTAMP}${SHORT_SHA}"
local SHA_DOCKER_NAME="${INPUT_NAME}:${SNAPSHOT_TAG}"
docker build $BUILDPARAMS -t ${DOCKERNAME} -t ${SHA_DOCKER_NAME} ${CONTEXT}
docker build ${INPUT_BUILDOPTIONS} ${BUILDPARAMS} -t ${DOCKERNAME} -t ${SHA_DOCKER_NAME} ${CONTEXT}
docker push ${DOCKERNAME}
docker push ${SHA_DOCKER_NAME}
echo ::set-output name=snapshot-tag::"${SNAPSHOT_TAG}"
}
function pushWithoutSnapshot() {
docker build $BUILDPARAMS -t ${DOCKERNAME} ${CONTEXT}
docker build ${INPUT_BUILDOPTIONS} ${BUILDPARAMS} -t ${DOCKERNAME} ${CONTEXT}
docker push ${DOCKERNAME}
}