More Docker Compose work

docker-compose.yml

@@ -47,7 +47,7 @@ services:
             # - ./conf/nginx/site-enabled_aether_fastapi_2_gunicorn.conf:/etc/nginx/conf.d/site-enabled_aether_fastapi_2_gunicorn.conf
             - ./conf/nginx/site-enabled_aether_flask_gunicorn.conf:/etc/nginx/conf.d/site-enabled_aether_flask_gunicorn.conf
 
-            - ./conf/certs/oneskyit.com_fullchain.pem:/etc/certs/fullchain.pem
+            - ./conf/certs/fullchain.pem:/etc/certs/fullchain.pem
             - ./conf/certs/privkey.pem:/etc/certs/privkey.pem
             - ./conf/certs/ssl-dhparams.pem:/etc/certs/ssl-dhparams.pem
 
@@ -144,41 +144,46 @@ services:
         # networks:
         #   - local-net
 
-    # phpmyadmin:
-    #     image: phpmyadmin
-    #     container_name: ae_phpmyadmin
-    #     restart: unless-stopped
-    #     depends_on:
-    #         - mariadb
-    #     ports:
-    #         - 8888:80
-    #     env_file:
-    #        - ./.env
-    #     environment:
-    #         - PMA_ARBITRARY=1
-    #         - UPLOAD_LIMIT=1G
-
-    # mariadb:
-    #     container_name: ae_mariadb_dev
-    #     image: mariadb/server:latest
-    #     restart: always
-    #     # image: mariadb:10.6
-    #     # env_file:
-    #     #     - ./.env
-    #     #     - filename.env
-    #     ports:
-    #         - "3307:3306"
-    #     volumes:
-    #         - ./srv/mariadb:/var/lib/mysql
-    #         # - ./conf/mariadb/my.cnf:/etc/my.cnf
-    #     environment:
-    #         - MARIADB_ROOT_PASSWORD='MyPassword.1248'
-    #         # - MARIADB_DATABASE: 'my_env_db'
-    #         # - MYSQL_ROOT_PASSWORD=
-    #         - MYSQL_PASSWORD=MyPassword
-    #         - MYSQL_DATABASE=nextcloud
-    #         - MYSQL_USER=nextcloud
+    phpmyadmin:
+        image: phpmyadmin
+        container_name: ae_phpmyadmin
+        restart: unless-stopped
+        depends_on:
+            - mariadb
+        ports:
+            - 8888:80
+        env_file:
+           - ./.env
+        environment:
+            - PMA_ARBITRARY=1
+            - UPLOAD_LIMIT=1G
 
+    mariadb:
+        container_name: ae_mariadb_dev
+        # image: mariadb/server:latest
+        image: mariadb:10.9
+        # image: mariadb:10.6
+        restart: always
+        # env_file:
+        #     - ./.env
+        #     - filename.env
+        ports:
+            - "3307:3306"
+        volumes:
+            - ./srv/mariadb:/var/lib/mysql
+            # - ./conf/mariadb/password_reset.sql:/docker-entrypoint-initdb.d/init.sql:ro
+            # - ./conf/mariadb/password_reset.sql:/password_reset.sql:z
+            # - ./srv/mariadb_ln:/var/lib/mysql
+            # - ./conf/mariadb/my.cnf:/etc/my.cnf
+        # environment:
+            # - MARIADB_ROOT_PASSWORD=$$1sky.Adapting.7e2
+            # - MARIADB_ROOT_PASSWORD=CentauriStar123
+            # - MARIADB_DATABASE: 'my_env_db'
+            # - MYSQL_ROOT_PASSWORD=$$1sky.Adapting.7e2
+            # - MYSQL_ROOT_PASSWORD=CentauriStar123
+            # - MYSQL_PASSWORD=MyPassword
+            # - MYSQL_DATABASE=nextcloud
+            # - MYSQL_USER=nextcloud
 
     # nextcloud25:
     #     container_name: ae_nextcloud25_dev