fix: docker stuff (merge pull request #33 from nohoster/docker-update)

Docker update

.dockerignore

@@ -0,0 +1,10 @@
+.github/
+.git/
+.gitignore
+.dockerignore
+config.php.example
+docker-compose.yml
+Dockerfile
+opensearch.xml.example
+README.md
+docker-old/

Dockerfile

@@ -1,10 +1,10 @@
-# syntax = edrevo/dockerfile-plus
-ARG VERSION="3.18"
-FROM alpine:${VERSION} AS librey
+FROM alpine:3.18
+
 WORKDIR "/var/www/html"
 
+ADD "." "."
+
 # Docker metadata contains information about the maintainer, such as the name, repository, and support email
-# Please add any necessary information or correct any incorrect information
 # See more: https://docs.docker.com/config/labels-custom-metadata/
 LABEL name="LibreY" \
       description="Framework and javascript free privacy respecting meta search engine" \
@@ -18,28 +18,25 @@ LABEL name="LibreY" \
 # Change or add new arguments to customize the image generated by 'docker build' command
 ARG DOCKER_SCRIPTS="docker"
 ARG NGINX_PORT=8080
+# Set this argument during build time to indicate that the path is for php's www.conf
+ARG WWW_CONFIG="/etc/php82/php-fpm.d/www.conf"
 
 # Customize the environment during both execution and build time by modifying the environment variables added to the container's shell
 # When building your image, make sure to set the 'TZ' environment variable to your desired time zone location, for example 'America/Sao_Paulo'
 # See more: https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List
 ENV TZ="America/New_York"
 
-RUN apk add gettext --no-cache
-
-# The following lines import all Dockerfiles from other folders so that they can be built together in the final build
-INCLUDE+ docker/php/php.dockerfile
-INCLUDE+ docker/server/nginx.dockerfile
-
-# Include docker scripts, docker images, and the 'GNU License' in the LibreY container
-ADD "." "/var/www/html"
+# Install required packages
+RUN apk add gettext php82 php82-fpm php82-dom php82-curl php82-json php82-apcu nginx --no-cache
 
-# Set permissions for script files as executable scripts inside 'docker/scripts' directory
-RUN chmod u+x "${DOCKER_SCRIPTS}/php/prepare.sh" &&\
-    chmod u+x "${DOCKER_SCRIPTS}/server/prepare.sh" &&\
-    chmod u+x "${DOCKER_SCRIPTS}/entrypoint.sh" &&\
-    chmod u+x "${DOCKER_SCRIPTS}/attributes.sh"
+# Configure PHP-FPM to listen on a Unix socket instead of a TCP port, which is more secure and efficient
+RUN touch /run/php-fpm82.sock && chown nginx:nginx "/run/php-fpm82.sock"
+RUN sed -i 's/^\s*listen = 127.0.0.1:9000/listen = \/run\/php-fpm82.sock/' ${WWW_CONFIG} &&\
+    sed -i 's/^\s*;\s*listen.owner = nobody/listen.owner = nginx/' ${WWW_CONFIG} &&\
+    sed -i 's/^\s*;\s*listen.group = nobody/listen.group = nginx/' ${WWW_CONFIG} &&\
+    sed -i 's/^\s*;\s*listen.mode = 0660/listen.mode = 0660/' ${WWW_CONFIG}
 
 EXPOSE ${NGINX_PORT}
 
 # Configures the container to be run as an executable.
-ENTRYPOINT ["/bin/sh", "-c", "docker/entrypoint.sh"]
+ENTRYPOINT ["/bin/sh", "-c", "docker/entrypoint.sh"]

docker/entrypoint.sh

@@ -1,10 +1,7 @@
 #!/bin/sh
 
-# Due to an issue with Docker's 'CMD' directive, the following scripts are not executing as expected.
-# This workaround has been implemented to resolve the issue for now
-sh "docker/php/prepare.sh"
-sh "docker/server/prepare.sh"
+/bin/sh -c docker/env-substitution.sh
 
-/bin/sh -c /usr/sbin/php-fpm8
+/bin/sh -c /usr/sbin/php-fpm82
 
 exec nginx -g "daemon off;"

docker/php/prepare.sh → docker/env-substitution.sh

@@ -1,23 +1,24 @@
 #!/bin/sh
 
-echo "[PREPARE] docker/server/prepare.sh'"
-
 # Load all environment variables from 'attributes.sh' using the command 'source /path/attributes.sh'
 source "docker/attributes.sh"
 
-# This condition creates the Unix socket if 'php-fpm8.sock' does not already exist.
-# This fixes an issue where Nginx starts but does not serve content
-if [ ! -d "/run/php8" ] || [ ! -S "/run/php8/php-fpm8.sock" ]; then
-    mkdir "/run/php8"
-    touch "/run/php8/php-fpm8.sock"
-    chmod 660 "/run/php8/php-fpm8.sock"
-    chown nginx:nginx "/run/php8/php-fpm8.sock"
-fi
-
-# The lines below will replace the environment variables in the templates with the corresponding variables listed above. To accomplish this, the GNU 'envsubst' package will be used
+# The lines below will replace the environment variables in the templates with the corresponding variables listed above if the config file is not yet provided. To accomplish this, the GNU 'envsubst' package will be used
 # Although not recommended (if you do not know what you are doing), you still have the option to add new substitution file templates using any required environment variables
-[[ ! -s ${CONFIG_PHP_TEMPLATE} ]] && cat 'docker/php/config.php' | envsubst > ${CONFIG_PHP_TEMPLATE};
-[[ ! -s ${CONFIG_OPEN_SEARCH_TEMPLATE} ]] && cat 'docker/php/opensearch.xml' | envsubst > ${CONFIG_OPEN_SEARCH_TEMPLATE};
+
+[[ ! -s ${CONFIG_PHP_TEMPLATE} ]] && cat 'docker/config.php' | envsubst > ${CONFIG_PHP_TEMPLATE};
+[[ ! -s ${CONFIG_OPEN_SEARCH_TEMPLATE} ]] && cat 'docker/opensearch.xml' | envsubst > ${CONFIG_OPEN_SEARCH_TEMPLATE};
+
+export OPEN_SEARCH_HOST_FOR_NGINX="$(echo "${OPEN_SEARCH_HOST}" | cut -d "/" -f 3 | cut -d ":" -f 1)"
+if [[ ! -s ${CONFIG_NGINX_TEMPLATE} ]]; then
+
+    cat 'docker/nginx.conf' | envsubst '${OPEN_SEARCH_HOST_FOR_NGINX}' > ${CONFIG_NGINX_TEMPLATE};
+    mv "docker/fastcgi.conf" /etc/nginx/fastcgi.conf
+
+    chown nginx:nginx "/etc/nginx/fastcgi.conf"
+    chown nginx:nginx "/etc/nginx/http.d/librey.conf"
+
+fi
 
 # If it is empty or proxy is not enabled, we are using sed to delete
 # any line that contains the string 'CURLOPT_PROXY' or 'CURLOPT_PROXYTYPE'

docker/server/nginx.conf → docker/nginx.conf

@@ -10,7 +10,7 @@ server {
     }
 
     location ~ \.php$ {
-        fastcgi_pass   unix:/run/php8/php-fpm8.sock;
+        fastcgi_pass   unix:/run/php-fpm82.sock;
         fastcgi_index  index.php;
         include        fastcgi.conf;
     }