Merge branch 'refs/heads/master' into uvicorn

# Conflicts:
#	dockerfiles/workspace/.shell-aliases

config/mariadb/root-account.cnf.example

@@ -0,0 +1,3 @@
+[client]
+user  = root
+password = 123456

docker-compose.base.yml

@@ -74,6 +74,8 @@ services:
   inbucket:
     image: inbucket/inbucket
     restart: always
+    expose:
+      - 2500
   redis:
     image: redis
     restart: always

docker-compose.yml.example

@@ -55,10 +55,14 @@ services:
     extends:
       file: docker-compose.base.yml
       service: pma
+    ports:
+      - "81:80"
   inbucket:
     extends:
       file: docker-compose.base.yml
       service: inbucket
+    ports:
+      - "82:9000"
   dnsmasq:
     restart: always
     build:

dockerfiles/workspace/.bash_aliases.example

@@ -0,0 +1,6 @@
+alias gst='git status'
+alias ga='git add'
+alias gc='git commit -m'
+alias gush='git push'
+alias gull='git pull'
+alias gb='git branch'

dockerfiles/workspace/.gitignore

@@ -1,2 +1,3 @@
-/aliases.sh
+/.bash_*
+!/.bash_.example
 /crontab

src/dockerfiles/php-fpm/php81.Dockerfile

@@ -1,4 +1,5 @@
 # syntax = edrevo/dockerfile-plus
+# https://github.com/docker-library/php/blob/52062af5056d0cd91fa5ded64fad8f9c82847b49/8.1/bookworm/fpm/Dockerfile
 FROM php:8.1-fpm
 
 INCLUDE+ ./php.base.Dockerfile

src/dockerfiles/workspace/workspace.base.Dockerfile

@@ -74,7 +74,7 @@ RUN sed -i 's/\r//' /root/aliases.sh && \
     echo "" >> ~/.bashrc && \
     echo "# Load Custom Aliases" >> ~/.bashrc && \
     echo "source ~/aliases.sh" >> ~/.bashrc && \
-	echo "" >> ~/.bashrc \
+	echo "" >> ~/.bashrc
 
 ###########################################################################
 # ssh: