diff --git a/Dockerfile.template b/Dockerfile.template index 1603eea..7f97b58 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/apache-conf-enabled/deny-certificates.conf b/apache-conf-enabled/deny-certificates.conf new file mode 100644 index 0000000..9c56680 --- /dev/null +++ b/apache-conf-enabled/deny-certificates.conf @@ -0,0 +1,65 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-compressed-files.conf b/apache-conf-enabled/deny-compressed-files.conf new file mode 100644 index 0000000..674fef3 --- /dev/null +++ b/apache-conf-enabled/deny-compressed-files.conf @@ -0,0 +1,25 @@ +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-csv.conf b/apache-conf-enabled/deny-csv.conf new file mode 100644 index 0000000..3cb0b46 --- /dev/null +++ b/apache-conf-enabled/deny-csv.conf @@ -0,0 +1,9 @@ +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-doc.conf b/apache-conf-enabled/deny-doc.conf new file mode 100644 index 0000000..d9f354a --- /dev/null +++ b/apache-conf-enabled/deny-doc.conf @@ -0,0 +1,5 @@ +# Denying word files + + Require all denied + + diff --git a/apache-conf-enabled/deny-dolibarr-conf.conf b/apache-conf-enabled/deny-dolibarr-conf.conf new file mode 100644 index 0000000..5f33952 --- /dev/null +++ b/apache-conf-enabled/deny-dolibarr-conf.conf @@ -0,0 +1,9 @@ +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-dolibarr-langs.conf b/apache-conf-enabled/deny-dolibarr-langs.conf new file mode 100644 index 0000000..497d335 --- /dev/null +++ b/apache-conf-enabled/deny-dolibarr-langs.conf @@ -0,0 +1,9 @@ +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-dotfiles.conf b/apache-conf-enabled/deny-dotfiles.conf new file mode 100644 index 0000000..d3e67f9 --- /dev/null +++ b/apache-conf-enabled/deny-dotfiles.conf @@ -0,0 +1,5 @@ +# Denying . files + + Require all denied + + diff --git a/apache-conf-enabled/deny-git.conf b/apache-conf-enabled/deny-git.conf new file mode 100644 index 0000000..400f1f5 --- /dev/null +++ b/apache-conf-enabled/deny-git.conf @@ -0,0 +1,9 @@ +# Deny git repositories and files + + Require all denied + + + + Require all denied + + diff --git a/apache-conf-enabled/deny-json.conf b/apache-conf-enabled/deny-json.conf new file mode 100644 index 0000000..392d511 --- /dev/null +++ b/apache-conf-enabled/deny-json.conf @@ -0,0 +1,5 @@ +# Deny JSON files + + Require all denied + + diff --git a/apache-conf-enabled/deny-sql.conf b/apache-conf-enabled/deny-sql.conf new file mode 100644 index 0000000..5a4fa89 --- /dev/null +++ b/apache-conf-enabled/deny-sql.conf @@ -0,0 +1,5 @@ +# Denying Database files + + Require all denied + + diff --git a/apache-conf-enabled/deny-svn.conf b/apache-conf-enabled/deny-svn.conf new file mode 100644 index 0000000..9821920 --- /dev/null +++ b/apache-conf-enabled/deny-svn.conf @@ -0,0 +1,5 @@ +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + diff --git a/apache-conf-enabled/deny-xml.conf b/apache-conf-enabled/deny-xml.conf new file mode 100644 index 0000000..03f24ea --- /dev/null +++ b/apache-conf-enabled/deny-xml.conf @@ -0,0 +1,5 @@ +# Denying XML files + + Require all denied + + diff --git a/apache-conf-enabled/deny-yml.conf b/apache-conf-enabled/deny-yml.conf new file mode 100644 index 0000000..0dbcc0a --- /dev/null +++ b/apache-conf-enabled/deny-yml.conf @@ -0,0 +1,5 @@ +# Denying Yaml files + + Require all denied + + diff --git a/images/15.0.3-php7.4/Dockerfile b/images/15.0.3-php7.4/Dockerfile index 2d3db01..9b789fd 100644 --- a/images/15.0.3-php7.4/Dockerfile +++ b/images/15.0.3-php7.4/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/15.0.3-php7.4/apache-deny.conf b/images/15.0.3-php7.4/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/15.0.3-php7.4/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/16.0.5-php8.1/Dockerfile b/images/16.0.5-php8.1/Dockerfile index cd77b5e..9c92a5f 100644 --- a/images/16.0.5-php8.1/Dockerfile +++ b/images/16.0.5-php8.1/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/16.0.5-php8.1/apache-deny.conf b/images/16.0.5-php8.1/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/16.0.5-php8.1/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/17.0.4-php8.1/Dockerfile b/images/17.0.4-php8.1/Dockerfile index 694f8e2..f889976 100644 --- a/images/17.0.4-php8.1/Dockerfile +++ b/images/17.0.4-php8.1/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/17.0.4-php8.1/apache-deny.conf b/images/17.0.4-php8.1/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/17.0.4-php8.1/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/18.0.6-php8.1/Dockerfile b/images/18.0.6-php8.1/Dockerfile index 8e7104e..b270e23 100644 --- a/images/18.0.6-php8.1/Dockerfile +++ b/images/18.0.6-php8.1/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/18.0.6-php8.1/apache-deny.conf b/images/18.0.6-php8.1/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/18.0.6-php8.1/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/19.0.4-php8.2/Dockerfile b/images/19.0.4-php8.2/Dockerfile index 383f418..d4e828c 100644 --- a/images/19.0.4-php8.2/Dockerfile +++ b/images/19.0.4-php8.2/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/19.0.4-php8.2/apache-deny.conf b/images/19.0.4-php8.2/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/19.0.4-php8.2/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/20.0.4-php8.2/Dockerfile b/images/20.0.4-php8.2/Dockerfile index 776d57a..bf51826 100644 --- a/images/20.0.4-php8.2/Dockerfile +++ b/images/20.0.4-php8.2/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/20.0.4-php8.2/apache-deny.conf b/images/20.0.4-php8.2/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/20.0.4-php8.2/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/21.0.0-php8.2/Dockerfile b/images/21.0.0-php8.2/Dockerfile index 2ecb457..d0b8358 100644 --- a/images/21.0.0-php8.2/Dockerfile +++ b/images/21.0.0-php8.2/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/21.0.0-php8.2/apache-deny.conf b/images/21.0.0-php8.2/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/21.0.0-php8.2/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/images/develop/Dockerfile b/images/develop/Dockerfile index a5e91fc..bf3f770 100644 --- a/images/develop/Dockerfile +++ b/images/develop/Dockerfile @@ -81,6 +81,9 @@ RUN apt-get update -y \ && mv ${PHP_INI_DIR}/php.ini-production ${PHP_INI_DIR}/php.ini \ && rm -rf /var/lib/apt/lists/* +COPY apache-deny.conf /etc/apache2/conf-enabled/deny.conf +RUN apache2ctl configtest + # Get Dolibarr RUN curl -fLSs https://github.com/Dolibarr/dolibarr/archive/${DOLI_VERSION}.tar.gz |\ tar -C /tmp -xz && \ diff --git a/images/develop/apache-deny.conf b/images/develop/apache-deny.conf new file mode 100644 index 0000000..515d3ff --- /dev/null +++ b/images/develop/apache-deny.conf @@ -0,0 +1,161 @@ +# Denying different certificate files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Deny various compression files + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + + + Require all denied + + +# Denying Spreadsheet files + + Require all denied + + + + Require all denied + + +# Denying word files + + Require all denied + + +# Deny dolibarr configuration file + + Require all denied + + + + Require all denied + + +# Deny Dolibarr language files + + Require all denied + + + + Require all denied + + +# Denying . files + + Require all denied + + +# Deny git repositories and files + + Require all denied + + + + Require all denied + + +# Deny JSON files + + Require all denied + + +# Denying Database files + + Require all denied + + +# Denying subversion because it was mentioned in the security.conf file that came with the container image + + Require all denied + + +# Denying XML files + + Require all denied + + +# Denying Yaml files + + Require all denied + + diff --git a/update.sh b/update.sh index e9b60fb..71a1e7f 100755 --- a/update.sh +++ b/update.sh @@ -86,6 +86,7 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do cp -a "${BASE_DIR}/docker-init.php" "${dir}/docker-init.php" cp -a "${BASE_DIR}/docker-run.sh" "${dir}/docker-run.sh" + cat apache-conf-enabled/*.conf > "${dir}/apache-deny.conf" if [ "${DOCKER_BUILD}" = "1" ]; then if [ "${DOCKER_PUSH}" = "1" ]; then