+ tmux
+ slow cnf db config with general log options example * fpm74 to php74 replacement fpm upstream name
This commit is contained in:
2
config/mariadb/.gitignore
vendored
Normal file
2
config/mariadb/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
*.cnf
|
||||
*.cnf.disable
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
3
dockerfiles/workspace/tmux.conf
Normal file
3
dockerfiles/workspace/tmux.conf
Normal file
@ -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}}"
|
@ -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:
|
||||
###########################################################################
|
||||
|
||||
|
@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user