wslave 0.3.8 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7beef53bb5664bdd4d7c010e64130366b45d8c51e5914735d20c2c7b7c78ad49
-  data.tar.gz: c217df1bb2f1a3c98cb2ec235009df760e1c21edbf144187c93f92c8a4bffd97
+  metadata.gz: ae8f5b776137111cf2c79936a1f7bc17126fe3a884441865cf5fa8895305a9ee
+  data.tar.gz: 9a604e9920dd201fec828720230c61036d933ac17625824f8148590864038ee0
 SHA512:
-  metadata.gz: ee80b70f838cfbf0747c3f671a06567f10904f420bfdbde1bfbf0eb8ff460a9e1b1c7d26b5f6e1ae35d92dfde21480f5063907357354ec06060e08212b482382
-  data.tar.gz: ba5543b2123617ac2cdbe19ac1e5a47a5ae1abb53b989229709eb241d67a978c9b73d0dd21731038c447ecc123a58ad0a99a2277ddf3104c2f23d2034cbb8aef
+  metadata.gz: 5cd61b1d6aed6bde6295cd27bc6d268373cb9e2a63ffc35dfaad03fb209395d209a95d45944f66eb24c588c508f546b944b2b6afb820f89fac5e960c0b36064c
+  data.tar.gz: 108c3f32c3fd2b2671889002f003a9c866e3a03f3757b75eac0863fad877bffbec35e660f7f31390e25a41d3a603b84b375022e4b9df2237f2f790b54acbd91d

data/base/config/deploy/production.rb

@@ -137,10 +137,10 @@ namespace :deploy do
     end
   end
 
-  desc 'Finds and replaces localhost:8000 and your Staging address with the Production address'
+  desc 'Finds and replaces localhost:8000 / localhost:8001and your Staging address with the Production address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+      puts 'Replacing localhost:8000 / localhost:8001 and Staging URLs with Production URLs...'
 
       # Set an anchor to first homogonize instances of URL's, then replace all the anchors
       anchor = "URL_REPLACEMENT_ANCHOR_00000"
@@ -167,6 +167,8 @@ namespace :deploy do
       # Set localhost entries to the anchor
       db_data = db_data.gsub(/localhost\%3A8000/, anchor)
       db_data = db_data.gsub(/localhost:8000/, anchor)
+      db_data = db_data.gsub(/localhost\%3A8001/, anchor)
+      db_data = db_data.gsub(/localhost:8001/, anchor)
 
       # Replace anchors with the correct target URL
       db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['production']}")

data/base/config/deploy/staging.rb

@@ -137,10 +137,10 @@ namespace :deploy do
     end
   end
 
-  desc 'Finds and replaces localhost:8000 and your Production address with the Staging address'
+  desc 'Finds and replaces localhost:8000 / localhost:8001 and your Production address with the Staging address'
   task :chikan do
     on roles(:web) do
-      puts 'Replacing localhost:8000 and Production URLs with Staging URLs...'
+      puts 'Replacing localhost:8000 / localhost:8001 and Production URLs with Staging URLs...'
 
       # Set an anchor to first homogonize instances of URL's, then replace all the anchors
       anchor = "URL_REPLACEMENT_ANCHOR_00000"
@@ -167,6 +167,8 @@ namespace :deploy do
       # Set localhost entries to the anchor
       db_data = db_data.gsub(/localhost\%3A8000/, anchor)
       db_data = db_data.gsub(/localhost:8000/, anchor)
+      db_data = db_data.gsub(/localhost\%3A8001/, anchor)
+      db_data = db_data.gsub(/localhost:8001/, anchor)
 
       # Replace anchors with the correct target URL
       db_data = db_data.gsub(anchor, "#{opts['deployer']['fqdn']['staging']}")

data/base/docker/apache/Dockerfile

@@ -1,4 +1,4 @@
-FROM php:7.4-apache
+FROM php:8.1-apache
 
 RUN a2enmod rewrite
 RUN service apache2 restart

data/base/docker/nginx/Dockerfile

@@ -1,27 +1,47 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 RUN apt-get update && apt-get dist-upgrade -y
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
-# NOTE: When the PHP FPM version changes, you MUST update the 
-#  version named in base/docker/nginx/supervisord.conf and
-#  in base/docker/nginx/nginx.vhost, then rebuild the nweb image!
-RUN apt-get install -y nginx php7.4-fpm php-mysql \
-	php7.4-mbstring php7.4-curl php7.4-dom php7.4-exif php7.4-fileinfo \
-	php7.4-json php7.4-imagick php7.4-xml php7.4-zip php7.4-iconv \
+
+RUN apt-get install -y nginx php-fpm php-mysql \
+	php-mbstring php-curl php-dom \
+	php-imagick php-xml php-zip \
+	composer nodejs npm \
 	libpng-dev libjpeg-dev \
 	mariadb-client mariadb-common \
-	supervisor curl
+	supervisor curl less neovim emacs
 RUN apt-get clean
-RUN adduser www-data root
+
 RUN mkdir /db \
-&& chmod 777 /db
+	&& chmod 777 /db
 
 COPY nginx.vhost /etc/nginx/sites-enabled/default
 COPY supervisord.conf /etc/supervisor/conf.d/supervisord.conf
-COPY php.ini /etc/php/7.4/fpm/php.ini
+
+# NOTE: When the PHP FPM version changes, you MUST change the
+#   version definition right below this comment, then you must
+#   rebuild the nweb image!
+ARG PHP_FPM_VERSION=8.1
+RUN mkdir -p /run/php
+COPY php.ini /etc/php/$PHP_FPM_VERSION/fpm/php.ini
+RUN ln -s /usr/sbin/php-fpm$PHP_FPM_VERSION /usr/sbin/php-fpm
+RUN ln -s /run/php/php$PHP_FPM_VERSION-fpm.sock /run/php/php-fpm.sock
+RUN ln -s /run/php/php$PHP_FPM_VERSION-fpm.pid /run/php/php-fpm.pid
+
+RUN npm install yarn -g
+
+# The lines below install wp-cli in the container. However, since
+#	wp-cli is run as root it causes various permission problems. In 
+#	the future this may be re-added with some method of correcting 
+#	permissions. Until then, please use wp-cli locally.
+#RUN curl https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar -o /usr/local/bin/wp
+#RUN chmod +x /usr/local/bin/wp
+#RUN mkdir /root/.wp-cli
+#COPY wp-cli.yml /root/.wp-cli/config.yml
+#RUN echo 'alias wp="wp --allow-root"' >>  /root/.bashrc
 
 RUN ln -sf /dev/stdout /var/log/nginx/access.log \
-    && ln -sf /dev/stderr /var/log/nginx/error.log
+	&& ln -sf /dev/stderr /var/log/nginx/error.log
 
 EXPOSE 80
 

data/base/docker/nginx/nginx.vhost

@@ -30,7 +30,7 @@ server {
 
       rewrite ^/index\.php$ /wordpress/index.php last;
       include snippets/fastcgi-php.conf;
-      fastcgi_pass unix:/run/php/php7.4-fpm.sock;
+      fastcgi_pass unix:/run/php/php-fpm.sock;
     }
 
     try_files $uri $uri/ /index.php?$args;