From cef34dfd08800af7234fd2d30f6b569e091a8b7d Mon Sep 17 00:00:00 2001
From: luizeof <luizeof@gmail.com>
Date: Fri, 11 Mar 2022 10:09:05 -0800
Subject: [PATCH] dockerfile

---
 Dockerfile    | 122 +++++++++++++++++++-------------------------------
 entrypoint.sh |  17 -------
 2 files changed, 47 insertions(+), 92 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 578e913..7635c0c 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -24,65 +24,29 @@ EXPOSE "7080/tcp"
 
 # Install System Libraries
 RUN apt-get update \
-  && \
-  apt-get install -y --no-install-recommends \
-  sudo \
-  software-properties-common \
-  build-essential \
-  curl \
-  tcl \
-  dos2unix \
-  cron \
-  bzip2 \
-  tidy \
-  sysvbanner \
-  wget \
-  less \
-  nano \
-  htop \
-  zip \
-  unzip \
-  git \
-  libwebp-dev \
-  webp \
-  libwebp6 \
-  graphicsmagick \
-  csstidy \
-  g++ \
-  zlib1g-dev \
-  libjpeg-dev \
-  libmagickwand-dev \
-  libpng-dev \
-  libgif-dev \
-  libtiff-dev \
-  libz-dev \
-  inetutils-ping \
-  libpq-dev \
-  libcurl4-openssl-dev \
-  libaprutil1-dev \
-  libssl-dev \
-  libicu-dev \
-  libldap2-dev \
-  libmemcached-dev \
-  libxml2-dev \
-  libzip-dev \
-  mariadb-client \
-  libwebp-dev \
-  libjpeg62-turbo-dev \
-  libxpm-dev \
-  libfreetype6-dev \
-  imagemagick \
-  ghostscript \
-  jpegoptim \
-  optipng \
-  pngquant \
-  libc-client-dev \
-  libjpeg-dev \
-  gifsicle \
-  groff \
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/* \
-  && sudo apt-get clean
+	&& \
+	apt-get install -y --no-install-recommends \
+	sudo \
+	curl \
+	cron \
+	sysvbanner \
+	wget \
+	nano \
+	htop \
+	zip \
+	unzip \
+	git \
+	webp \
+	libwebp6 \
+	graphicsmagick \
+	imagemagick \
+	zlib1g \
+	inetutils-ping \
+	libxml2 \
+	default-mysql-client\
+	&& apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& sudo apt-get clean
 
 # Make sure we have required tools
 RUN install_packages \
@@ -155,6 +119,18 @@ RUN install_packages \
 	"procps" \
 	"tzdata"
 
+
+# PHP Settings
+RUN  sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 128M/g' /usr/local/lsws/lsphp74/etc/php/7.4/litespeed/php.ini
+RUN sed -i 's/post_max_size = 8M/post_max_size = 256M/g' /usr/local/lsws/lsphp74/etc/php/7.4/litespeed/php.ini
+RUN  { \
+	echo 'opcache.memory_consumption=768'; \
+	echo 'opcache.interned_strings_buffer=16'; \
+	echo 'opcache.max_accelerated_files=99999'; \
+	echo 'opcache.revalidate_freq=2'; \
+	echo 'opcache.fast_shutdown=1'; \
+	} >>/usr/local/lsws/lsphp74/etc/php/7.4/mods-available/opcache.ini
+
 # Create the directories
 RUN mkdir --parents \
 	"/tmp/lshttpd/gzcache" \
@@ -208,8 +184,8 @@ RUN chown "www-data:www-data" \
 	"/var/www"
 
 RUN apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  ; \
-  rm -rf /var/lib/apt/lists/*
+	; \
+	rm -rf /var/lib/apt/lists/*
 
 # Default Volume for Web
 VOLUME /var/www/html
@@ -226,21 +202,19 @@ RUN chmod -R +777 /usr/local/bin/
 
 # Copy Crontab
 COPY cron.d/dockerpress.crontab /etc/cron.d/dockerpress
-
-RUN dos2unix /etc/cron.d/dockerpress
 RUN chmod 644 /etc/cron.d/dockerpress
 
 RUN { \
-  echo '[client]'; \
-  echo 'user=MYUSER'; \
-  echo "password='MYPASSWORD'"; \
-  echo 'host=MYHOST'; \
-  echo 'port=MYPORT'; \
-  echo ''; \
-  echo '[mysql]'; \
-  echo 'database=MYDATABASE'; \
-  echo ''; \
-  } > /root/.my.cnf.sample
+	echo '[client]'; \
+	echo 'user=MYUSER'; \
+	echo "password='MYPASSWORD'"; \
+	echo 'host=MYHOST'; \
+	echo 'port=MYPORT'; \
+	echo ''; \
+	echo '[mysql]'; \
+	echo 'database=MYDATABASE'; \
+	echo ''; \
+	} > /root/.my.cnf.sample
 
 # Running wordpress startup scripts
 COPY entrypoint.sh /usr/local/bin/entrypoint.sh
@@ -252,6 +226,4 @@ EXPOSE 80
 # Set the workdir and command
 ENV PATH="/usr/local/lsws/bin:${PATH}"
 
-STOPSIGNAL "SIGTERM"
-
 ENTRYPOINT ["entrypoint.sh"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 656a279..eca958c 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -20,20 +20,6 @@ function update_wp_config() {
   wp config set WP_DEBUG $WP_DEBUG --raw --add --type=constant
 }
 
-function update_php_ini() {
-  echo "Updating php.ini ..."
-  sed -i 's/upload_max_filesize = 2M/upload_max_filesize = 128M/g' /usr/local/lsws/lsphp74/etc/php/7.4/litespeed/php.ini
-  sed -i 's/post_max_size = 8M/post_max_size = 256M/g' /usr/local/lsws/lsphp74/etc/php/7.4/litespeed/php.ini
-
-  {
-    echo 'opcache.memory_consumption=768'
-    echo 'opcache.interned_strings_buffer=16'
-    echo 'opcache.max_accelerated_files=99999'
-    echo 'opcache.revalidate_freq=2'
-    echo 'opcache.fast_shutdown=1'
-  } >>/usr/local/lsws/lsphp74/etc/php/7.4/mods-available/opcache.ini
-}
-
 function generate_litespeed_password() {
   if [ -n "${ADMIN_PASSWORD}" ]; then
     ENCRYPT_PASSWORD="$(/usr/local/lsws/admin/fcgi-bin/admin_php -q '/usr/local/lsws/admin/misc/htpasswd.php' "${ADMIN_PASSWORD}")"
@@ -149,9 +135,6 @@ function install_dockerpress_plugins() {
 
 cd /var/www/html
 
-# Update php.ini
-update_php_ini
-
 # Generate litespeed Admin Password
 generate_litespeed_password