From 38cb19818a55243805561aba1fdc60911f4bfe04 Mon Sep 17 00:00:00 2001
From: dimti <demidov@dimti.ru>
Date: Sat, 6 May 2023 11:29:17 +0300
Subject: [PATCH] + tmux + slow cnf db config with general log options example
 * fpm74 to php74 replacement fpm upstream name

---
 config/mariadb/.gitignore                           |  2 ++
 config/mariadb/{slow.cnf => slow.cnf.example}       |  0
 config/nginx/conf.d/z-grav.conf.example             |  2 +-
 config/nginx/conf.d/z-wordpress.conf.example        |  4 ++--
 dockerfiles/workspace/tmux.conf                     |  3 +++
 dockerfiles/workspace/workspace74.Dockerfile        | 15 +++++++++++++++
 src/dockerfiles/workspace/workspace.base.Dockerfile | 15 ---------------
 7 files changed, 23 insertions(+), 18 deletions(-)
 create mode 100644 config/mariadb/.gitignore
 rename config/mariadb/{slow.cnf => slow.cnf.example} (100%)
 create mode 100644 dockerfiles/workspace/tmux.conf

diff --git a/config/mariadb/.gitignore b/config/mariadb/.gitignore
new file mode 100644
index 0000000..a1e3302
--- /dev/null
+++ b/config/mariadb/.gitignore
@@ -0,0 +1,2 @@
+*.cnf
+*.cnf.disable
\ No newline at end of file
diff --git a/config/mariadb/slow.cnf b/config/mariadb/slow.cnf.example
similarity index 100%
rename from config/mariadb/slow.cnf
rename to config/mariadb/slow.cnf.example
diff --git a/config/nginx/conf.d/z-grav.conf.example b/config/nginx/conf.d/z-grav.conf.example
index 89bc08f..9dd026a 100644
--- a/config/nginx/conf.d/z-grav.conf.example
+++ b/config/nginx/conf.d/z-grav.conf.example
@@ -7,7 +7,7 @@ server {
         try_files $uri $uri/ /index.php?$query_string;
     }
     location ~ \.php$ {
-        fastcgi_pass fpm74;
+        fastcgi_pass php74;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
     }
diff --git a/config/nginx/conf.d/z-wordpress.conf.example b/config/nginx/conf.d/z-wordpress.conf.example
index a01252d..1f10bea 100644
--- a/config/nginx/conf.d/z-wordpress.conf.example
+++ b/config/nginx/conf.d/z-wordpress.conf.example
@@ -26,7 +26,7 @@ server {
         fastcgi_param PATH_INFO       $fastcgi_path_info;
         fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
 
-        fastcgi_pass   fpm74;
+        fastcgi_pass   php74;
         fastcgi_index  index.php;
         fastcgi_read_timeout 3000;
     }
@@ -56,7 +56,7 @@ server {
         fastcgi_param PATH_INFO       $fastcgi_path_info;
         fastcgi_param PATH_TRANSLATED $document_root$fastcgi_path_info;
 
-        fastcgi_pass   fpm74;
+        fastcgi_pass   php74;
         fastcgi_index  index.php;
         fastcgi_read_timeout 3000;
     }
diff --git a/dockerfiles/workspace/tmux.conf b/dockerfiles/workspace/tmux.conf
new file mode 100644
index 0000000..3ab7d2a
--- /dev/null
+++ b/dockerfiles/workspace/tmux.conf
@@ -0,0 +1,3 @@
+set-option -g status-interval 1
+set-option -g automatic-rename on
+set-option -g automatic-rename-format "#{?#{==:#{pane_current_command},bash},#{b:pane_current_path},#{pane_current_command}}"
\ No newline at end of file
diff --git a/dockerfiles/workspace/workspace74.Dockerfile b/dockerfiles/workspace/workspace74.Dockerfile
index 815f0d0..fd03f61 100644
--- a/dockerfiles/workspace/workspace74.Dockerfile
+++ b/dockerfiles/workspace/workspace74.Dockerfile
@@ -88,6 +88,21 @@ USER laradock
 COPY ./minio/auth.json /home/laradock/.mc/config.json
 
 ###########################################################################
+# Tmux and others temproray applications - must be moved into src build
+###########################################################################
+
+USER root
+
+RUN apt-get update -yqq && \
+    apt-get install -y tmux
+
+COPY ./tmux.conf /etc/tmux.conf
+
+# Clean up
+RUN apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+###########################################################################
 # Tune opts:
 ###########################################################################
 
diff --git a/src/dockerfiles/workspace/workspace.base.Dockerfile b/src/dockerfiles/workspace/workspace.base.Dockerfile
index 0ef5c99..964500c 100644
--- a/src/dockerfiles/workspace/workspace.base.Dockerfile
+++ b/src/dockerfiles/workspace/workspace.base.Dockerfile
@@ -1,18 +1,3 @@
-#
-#--------------------------------------------------------------------------
-# Image Setup
-#--------------------------------------------------------------------------
-#
-# To edit the 'workspace' base Image, visit its repository on Github
-#    https://github.com/Laradock/workspace
-#
-# To change its version, see the available Tags on the Docker Hub:
-#    https://hub.docker.com/r/laradock/workspace/tags/
-#
-# Note: Base Image name format {image-tag}-{php-version}
-#
-LABEL maintainer="Mahmoud Zalt <mahmoud@zalt.me>"
-
 # Set Environment Variables
 ENV DEBIAN_FRONTEND noninteractive