Merge pull request #79 from Upstatement/pull-in-esk-updates

Add M1 Compatibility & Pull in 2022 ESK updates
Upstatement · Jan 24, 2023 · 1fb41ec · 1fb41ec
2 parents bb17d69 + ad504f2
commit 1fb41ec
Show file tree

Hide file tree

Showing 29 changed files with 3,870 additions and 313 deletions.
diff --git a/.deployignore b/.deployignore
@@ -7,6 +7,7 @@ composer.json
 composer.lock
 docker
 docker-compose.yml
+docker-compose.ups-dock.yml
 Dockerfile
 node_modules
 wp-content

diff --git a/.env.sample b/.env.sample
@@ -2,4 +2,7 @@
 WORDPRESS_THEME_NAME=skela
 
 # Runtime environment
-WP_ENV=development
+WP_ENV=development
+
+# Compose File
+COMPOSE_FILE=docker-compose.yml:docker-compose.ups-dock.yml
diff --git a/.gitignore b/.gitignore
@@ -6,7 +6,6 @@ Thumbs.db
 /.vscode/
 
 # Packages
-/composer.lock
 /vendor/
 /node_modules/
 npm-debug.log*

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v12.16.2
+v16.13.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,11 +1,14 @@
-FROM richarvey/nginx-php-fpm:1.9.0
+# Note: 1.10.4 fails to initialize
+# https://gitlab.com/ric_harvey/nginx-php-fpm/-/issues/307
+FROM richarvey/nginx-php-fpm:1.10.3
 
-RUN apk update && apk add \
+RUN apk upgrade && apk update && apk add \
   mysql-client \
   openssl \
   msmtp \
   less \
-  tzdata
+  tzdata \
+  mariadb-connector-c
 
 # Configure msmtp
 RUN { \

diff --git a/MULTISITE.md b/MULTISITE.md