Skip to content

Commit 8517eeb

Browse files
committed
Add build tool and support local builds
1 parent 6a09547 commit 8517eeb

File tree

3 files changed

+23
-4
lines changed

3 files changed

+23
-4
lines changed

build

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
#!/usr/bin/env bash
2+
3+
# Run the CLI for local builds and docker hub build rules; see hooks/README.md
4+
# Note: you must have jqmd, jq, and a yaml2json tool, as well as curl
5+
6+
exec jqmd hooks/README.md "$@"
7+

hooks/README.md

+8-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,14 @@ case ${1-} in
176176
done
177177
RUN_JQ .
178178
;;
179-
*) echo "argument required: fetch, dump, or push" >&2; exit 64 ;;
179+
local)
180+
multibuild() { DOCKER_TAG=$2-$3.$4,$2-$3.x,$1-$3.x,$2,$1 hooks/build; }
181+
for ver in "${@:2}"; do
182+
min=${ver%-*}; maj=${min%.*}; rel=${ver#*-}; rmin=${rel#*.}; rmaj=${rel%%.*}
183+
multibuild "$maj" "$min" "$rmaj" "$rmin"
184+
done
185+
;;
186+
*) echo "argument required: local, fetch, dump, or push" >&2; exit 64 ;;
180187
esac
181188

182189
CLEAR_FILTERS

hooks/build

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,17 @@
11
#!/bin/bash
22

3+
IMAGE_NAME=${IMAGE_NAME-dirtsimple/php-server:${DOCKER_TAG%%,*}}
4+
35
case $DOCKER_TAG in
4-
7.1.*|7.2.26) PHP_VER=${DOCKER_TAG%%-*}; OS_VER=3.9;;
5-
7.*) PHP_VER=${DOCKER_TAG%%-*}; OS_VER=3.10;;
6+
7.1.*|7.2.26|7.3.13)
7+
PHP_VER=${DOCKER_TAG%%-*}; OS_VER=3.9;;
8+
7.*)
9+
PHP_VER=${DOCKER_TAG%%-*}; OS_VER=3.10;;
610
esac
711

8-
docker build ${PHP_VER+ --build-arg PHP_VER=$PHP_VER}${OS_VER+ --build-arg OS_VER=$OS_VER} -f "$DOCKERFILE_PATH" -t "$IMAGE_NAME" .
12+
docker build ${PHP_VER+ --build-arg PHP_VER=$PHP_VER}${OS_VER+ --build-arg OS_VER=$OS_VER} -f "${DOCKERFILE_PATH-Dockerfile}" -t "$IMAGE_NAME" .
913

1014
for tag in ${DOCKER_TAG//,/ }; do
15+
echo "Tagging ${IMAGE_NAME%%:*}:$tag"
1116
[[ $tag == "${IMAGE_NAME/##*:}" ]] || docker tag "$IMAGE_NAME" "${IMAGE_NAME%%:*}:$tag"
1217
done

0 commit comments

Comments
 (0)