From 1448a3a2dd0a5a1833aa83d7f5791c568a8acf31 Mon Sep 17 00:00:00 2001
From: "Pavel@Vostro5468" <pavel@mxstar.ru>
Date: Sun, 27 Mar 2022 13:12:22 +0300
Subject: [PATCH] Addef FOX_WEBROOT env var and error output fix

---
 Dockerfile                                    |  1 +
 build                                         | 54 -------------------
 .../apache2/sites-available/000-default.conf  |  2 +-
 3 files changed, 2 insertions(+), 55 deletions(-)
 delete mode 100755 build

diff --git a/Dockerfile b/Dockerfile
index 9fb4475..27ee326 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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/"]
 
diff --git a/build b/build
deleted file mode 100755
index 49f65da..0000000
--- a/build
+++ /dev/null
@@ -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
-
diff --git a/rootfs/etc/apache2/sites-available/000-default.conf b/rootfs/etc/apache2/sites-available/000-default.conf
index e435af0..6d12974 100644
--- a/rootfs/etc/apache2/sites-available/000-default.conf
+++ b/rootfs/etc/apache2/sites-available/000-default.conf
@@ -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