diff --git a/Dockerfile b/Dockerfile index 56d2704..fb3f9b3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN make install WORKDIR /goaccess RUN cp /goaccess-temp/goaccess.tar.gz . RUN tar --strip-components=1 -xzvf goaccess.tar.gz -RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( GOAN<\/a> v1.1.32<\/span> )/" /goaccess/resources/tpls.html +RUN sed -i "s/GWSocket<\/a>/GWSocket<\/a> ( GOAN<\/a> v1.1.33<\/span> )/" /goaccess/resources/tpls.html RUN sed -i "s/bottom: 190px/bottom: 260px/" /goaccess/resources/css/app.css RUN ./configure --enable-utf8 --enable-geoip=mmdb --with-getline RUN make @@ -71,7 +71,7 @@ RUN chmod +x start.sh RUN mkdir -p /goaccess-logs/archives VOLUME ["/opt/log"] -VOLUME ["/opt/custom"] + EXPOSE 7880 #CMD ["bash", "/goan/start.sh"] ENTRYPOINT ["tini", "--", "/goan/start.sh"] \ No newline at end of file diff --git a/assests/maxmind/GeoLite2-ASN.mmdb b/assests/maxmind/GeoLite2-ASN.mmdb index aa31673..d76c625 100644 Binary files a/assests/maxmind/GeoLite2-ASN.mmdb and b/assests/maxmind/GeoLite2-ASN.mmdb differ diff --git a/assests/maxmind/GeoLite2-City.mmdb b/assests/maxmind/GeoLite2-City.mmdb index e00d754..74a5364 100644 Binary files a/assests/maxmind/GeoLite2-City.mmdb and b/assests/maxmind/GeoLite2-City.mmdb differ diff --git a/assests/maxmind/GeoLite2-Country.mmdb b/assests/maxmind/GeoLite2-Country.mmdb index f32738e..afc56b1 100644 Binary files a/assests/maxmind/GeoLite2-Country.mmdb and b/assests/maxmind/GeoLite2-Country.mmdb differ diff --git a/resources/scripts/start.sh b/resources/scripts/start.sh index 698f8ff..3d3bce1 100755 --- a/resources/scripts/start.sh +++ b/resources/scripts/start.sh @@ -10,7 +10,7 @@ source $(dirname "$0")/logs/ncsa_combined.sh source $(dirname "$0")/logs/nginx_access.sh source $(dirname "$0")/logs/caddy.sh -goan_version="GOAN v1.1.32" +goan_version="GOAN v1.1.33" goan_log_path="/opt/log" goaccess_ping_interval=15 @@ -81,7 +81,13 @@ elif [[ "${LOG_TYPE}" == "TRAEFIK" ]]; then elif [[ "${LOG_TYPE}" == "NCSA_COMBINED" ]]; then ncsa_combined elif [[ "${LOG_TYPE}" == "CUSTOM" ]]; then - custom + if [ -d "/opt/custom" ] && [ -w "/opt/custom" ]; then + echo "Custom directory /opt/custom is available." + custom + else + echo "Custom directory /opt/custom is not available. Exiting..." + exit 1 + fi elif [[ "${LOG_TYPE}" == "NGINX_ACCESS" ]]; then nginx_access elif [[ "${LOG_TYPE}" == "CADDY_V1" ]]; then