sda-php
/
nulib
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

maj runphp

This commit is contained in:
Jephté Clain 2024-10-21 18:54:05 +04:00
parent 4a7e4cac68
commit 10d013d3ff
2 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
runphp/runphp
View File

@ -132,8 +132,22 @@ function composer() {
fi fi
} }
function ensure_image() { function ensure_image() {
local dfdir suffix dockerfiles dockerfile
local privareg imagename local privareg imagename
if [ -z "$IMAGE" ]; then if [ -z "$Image" ]; then
[ -n "$RUNPHP_STANDALONE" ] && dfdir="$RUNPHP_STANDALONE/runphp" || dfdir="$MYDIR"
dockerfiles=(
"_local:$dfdir/Dockerfile.runphp.local"
"${BUILD_FLAVOUR//+/_}:$dfdir/Dockerfile.runphp$BUILD_FLAVOUR"
":$dfdir/Dockerfile.runphp"
)
for dockerfile in "${dockerfiles[@]}"; do
suffix="${dockerfile%:*}"
dockerfile="${dockerfile##*:}"
[ -f "$dockerfile" ] && break
done
Dockerfile="$dockerfile"
[[ "$IMAGENAME" == */ ]] && imagename=runphp || imagename="${IMAGENAME%/*}/runphp" [[ "$IMAGENAME" == */ ]] && imagename=runphp || imagename="${IMAGENAME%/*}/runphp"
privareg="$PRIVAREG" privareg="$PRIVAREG"
if [ "$imagename" == runphp ]; then if [ "$imagename" == runphp ]; then
@ -141,11 +155,11 @@ function ensure_image() {
else else
[ -z "$privareg" ] && privareg=docker.io [ -z "$privareg" ] && privareg=docker.io
fi fi
IMAGE="$privareg/$imagename:$DIST" Image="$privareg/$imagename$suffix:$DIST"
fi fi
} }
function check_image() { function check_image() {
local image="$IMAGE" local image="$Image"
for prefix in docker.io/library/ docker.io; do for prefix in docker.io/library/ docker.io; do
if [ "${image#$prefix}" != "$image" ]; then if [ "${image#$prefix}" != "$image" ]; then
image="${image#$prefix}" image="${image#$prefix}"
@ -265,7 +279,7 @@ if [ "$RUNPHP_MODE" != docker ]; then
fi fi
# Toujours vérifier l'existence de l'image # Toujours vérifier l'existence de l'image
IMAGE= Image=
if [ -z "$Bootstrap" ]; then if [ -z "$Bootstrap" ]; then
if [ -n "$RUNPHP_FORCE_BUILDENVS" ]; then if [ -n "$RUNPHP_FORCE_BUILDENVS" ]; then
eval "Configs=($RUNPHP_FORCE_BUILDENVS)" eval "Configs=($RUNPHP_FORCE_BUILDENVS)"
@ -376,26 +390,13 @@ OPTIONS
ensure_image ensure_image
check_image && exists=1 || exists= check_image && exists=1 || exists=
if [ -z "$UnlessExists" -o -z "$exists" ]; then if [ -z "$UnlessExists" -o -z "$exists" ]; then
eecho "== Building $IMAGE" eecho "== Building $Image"
if [ -n "$RUNPHP_STANDALONE" ]; then
DFDIR="$RUNPHP_STANDALONE/runphp"
else
DFDIR="$MYDIR"
fi
dockerfiles=(
"$DFDIR/Dockerfile.runphp.local"
"$DFDIR/Dockerfile.runphp$BUILD_FLAVOUR"
"$DFDIR/Dockerfile.runphp"
)
for dockerfile in "${dockerfiles[@]}"; do
[ -f "$dockerfile" ] && break
done
args=( args=(
-f "$dockerfile" -f "$Dockerfile"
${Pull:+--pull} ${Pull:+--pull}
${NoCache:+--no-cache} ${NoCache:+--no-cache}
${BuildPlain:+--progress plain} ${BuildPlain:+--progress plain}
-t "$IMAGE" -t "$Image"
) )
for arg in "${BUILD_ARGS[@]}"; do for arg in "${BUILD_ARGS[@]}"; do
args+=(--build-arg "$arg=${!arg}") args+=(--build-arg "$arg=${!arg}")
@ -410,8 +411,8 @@ OPTIONS
docker build "${args[@]}" /tmp/runphp-build || exit 1 docker build "${args[@]}" /tmp/runphp-build || exit 1
if [ -n "$Push" -a -n "$PRIVAREG" ]; then if [ -n "$Push" -a -n "$PRIVAREG" ]; then
eecho "== Pushing $IMAGE" eecho "== Pushing $Image"
docker push "$IMAGE" || exit 1 docker push "$Image" || exit 1
fi fi
fi fi
if [ -z "$RUNPHP_STANDALONE" -a ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then if [ -z "$RUNPHP_STANDALONE" -a ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then
@ -522,7 +523,7 @@ OPTIONS
fi fi
args+=( args+=(
"$IMAGE" "$Image"
exec "$0" ${Chdir:+-w "$Chdir"} exec "$0" ${Chdir:+-w "$Chdir"}
) )
[ -n "$ComposerInstall" ] && set -- ci [ -n "$ComposerInstall" ] && set -- ci

47
runphp/runphp.2postamble
View File

@ -83,8 +83,22 @@ function composer() {
fi fi
} }
function ensure_image() { function ensure_image() {
local dfdir suffix dockerfiles dockerfile
local privareg imagename local privareg imagename
if [ -z "$IMAGE" ]; then if [ -z "$Image" ]; then
[ -n "$RUNPHP_STANDALONE" ] && dfdir="$RUNPHP_STANDALONE/runphp" || dfdir="$MYDIR"
dockerfiles=(
"_local:$dfdir/Dockerfile.runphp.local"
"${BUILD_FLAVOUR//+/_}:$dfdir/Dockerfile.runphp$BUILD_FLAVOUR"
":$dfdir/Dockerfile.runphp"
)
for dockerfile in "${dockerfiles[@]}"; do
suffix="${dockerfile%:*}"
dockerfile="${dockerfile##*:}"
[ -f "$dockerfile" ] && break
done
Dockerfile="$dockerfile"
[[ "$IMAGENAME" == */ ]] && imagename=runphp || imagename="${IMAGENAME%/*}/runphp" [[ "$IMAGENAME" == */ ]] && imagename=runphp || imagename="${IMAGENAME%/*}/runphp"
privareg="$PRIVAREG" privareg="$PRIVAREG"
if [ "$imagename" == runphp ]; then if [ "$imagename" == runphp ]; then
@ -92,11 +106,11 @@ function ensure_image() {
else else
[ -z "$privareg" ] && privareg=docker.io [ -z "$privareg" ] && privareg=docker.io
fi fi
IMAGE="$privareg/$imagename:$DIST" Image="$privareg/$imagename$suffix:$DIST"
fi fi
} }
function check_image() { function check_image() {
local image="$IMAGE" local image="$Image"
for prefix in docker.io/library/ docker.io; do for prefix in docker.io/library/ docker.io; do
if [ "${image#$prefix}" != "$image" ]; then if [ "${image#$prefix}" != "$image" ]; then
image="${image#$prefix}" image="${image#$prefix}"
@ -216,7 +230,7 @@ if [ "$RUNPHP_MODE" != docker ]; then
fi fi
# Toujours vérifier l'existence de l'image # Toujours vérifier l'existence de l'image
IMAGE= Image=
if [ -z "$Bootstrap" ]; then if [ -z "$Bootstrap" ]; then
if [ -n "$RUNPHP_FORCE_BUILDENVS" ]; then if [ -n "$RUNPHP_FORCE_BUILDENVS" ]; then
eval "Configs=($RUNPHP_FORCE_BUILDENVS)" eval "Configs=($RUNPHP_FORCE_BUILDENVS)"
@ -327,26 +341,13 @@ OPTIONS
ensure_image ensure_image
check_image && exists=1 || exists= check_image && exists=1 || exists=
if [ -z "$UnlessExists" -o -z "$exists" ]; then if [ -z "$UnlessExists" -o -z "$exists" ]; then
eecho "== Building $IMAGE" eecho "== Building $Image"
if [ -n "$RUNPHP_STANDALONE" ]; then
DFDIR="$RUNPHP_STANDALONE/runphp"
else
DFDIR="$MYDIR"
fi
dockerfiles=(
"$DFDIR/Dockerfile.runphp.local"
"$DFDIR/Dockerfile.runphp$BUILD_FLAVOUR"
"$DFDIR/Dockerfile.runphp"
)
for dockerfile in "${dockerfiles[@]}"; do
[ -f "$dockerfile" ] && break
done
args=( args=(
-f "$dockerfile" -f "$Dockerfile"
${Pull:+--pull} ${Pull:+--pull}
${NoCache:+--no-cache} ${NoCache:+--no-cache}
${BuildPlain:+--progress plain} ${BuildPlain:+--progress plain}
-t "$IMAGE" -t "$Image"
) )
for arg in "${BUILD_ARGS[@]}"; do for arg in "${BUILD_ARGS[@]}"; do
args+=(--build-arg "$arg=${!arg}") args+=(--build-arg "$arg=${!arg}")
@ -361,8 +362,8 @@ OPTIONS
docker build "${args[@]}" /tmp/runphp-build || exit 1 docker build "${args[@]}" /tmp/runphp-build || exit 1
if [ -n "$Push" -a -n "$PRIVAREG" ]; then if [ -n "$Push" -a -n "$PRIVAREG" ]; then
eecho "== Pushing $IMAGE" eecho "== Pushing $Image"
docker push "$IMAGE" || exit 1 docker push "$Image" || exit 1
fi fi
fi fi
if [ -z "$RUNPHP_STANDALONE" -a ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then if [ -z "$RUNPHP_STANDALONE" -a ! -f "$PROJDIR/$VENDORDIR/nulib/php/load.sh" ]; then
@ -473,7 +474,7 @@ OPTIONS
fi fi
args+=( args+=(
"$IMAGE" "$Image"
exec "$0" ${Chdir:+-w "$Chdir"} exec "$0" ${Chdir:+-w "$Chdir"}
) )
[ -n "$ComposerInstall" ] && set -- ci [ -n "$ComposerInstall" ] && set -- ci