Addef FOX_WEBROOT env var and error output fix
agola/fox-web-basic/Build image The run finished successfully Details

This commit is contained in:
Pavel@Vostro5468 2022-03-27 13:12:22 +03:00
parent 03f7bc78d0
commit 1448a3a2dd
3 changed files with 2 additions and 55 deletions

View File

@ -1,6 +1,7 @@
FROM ubuntu:20.04
ENV php_version=8.1
ENV FOX_WEBROOT=/var/www/html
COPY ["/rootfs/etc/timezone", "/rootfs/etc/localtime", "/etc/"]

54
build
View File

@ -1,54 +0,0 @@
#!/bin/bash
build_name='fox-web-basic'
build_repos='mxfox.ru/chimera'
branch='latest'
while getopts "b:dph" opt; do
case $opt in
d) DRY=1;;
p) PUSH=1;;
b) branch="${OPTARG}";;
h) echo "Usage:
# -d - dry-run (only prepare, not build)
# -p - push (build, tag but no push.
# -b - branch
# -t - target
";exit;;
esac
done
if [ ! -f last_version ]
then
if [ ! -f init_version ]
then
echo "1000" > init_version
exit
fi
cp init_version last_version
fi
build_version=`cat last_version`
(( build_version++ ))
echo "Building image ${build_name}:$branch-$build_version";
if [ -n "$DRY" ]
then
echo DRY-RUN Selected. Build disabled
exit;
fi
push_suffix='--output=type=local,dest=./images'
if [ -n "$PUSH" ]
then
push_suffix='--push'
fi
(( build_version++ ))
docker buildx build --platform linux/arm,linux/arm64,linux/amd64 --tag=${build_repos}/${build_name}:${build_version} --tag ${build_repos}/${build_name}:latest . ${push_suffix}
echo ${build_version} > last_version

View File

@ -21,7 +21,7 @@
# modules, e.g.
#LogLevel info ssl:warn
ErrorLog ${APACHE_LOG_DIR}/error.log
#ErrorLog ${APACHE_LOG_DIR}/error.log
CustomLog ${APACHE_LOG_DIR}/access.log combined
# For most configuration files from conf-available/, which are