From 0ceabdc7a4206ce3c638a9d82ad57db31bdcc99c Mon Sep 17 00:00:00 2001
From: markliu2013 <markliu2013@gmail.com>
Date: Mon, 15 Jan 2024 21:20:54 +0800
Subject: [PATCH] save

---
 docker-compose-ali.yml |  2 ++
 docker-compose-hub.yml |  2 ++
 docker-compose.yml     |  2 ++
 mysql/Dockerfile       | 18 ------------------
 mysql/init.sql         |  2 --
 mysql/my.cnf           | 14 --------------
 6 files changed, 6 insertions(+), 34 deletions(-)
 delete mode 100644 mysql/Dockerfile
 delete mode 100644 mysql/init.sql
 delete mode 100644 mysql/my.cnf

diff --git a/docker-compose-ali.yml b/docker-compose-ali.yml
index 7d99402..87299f6 100644
--- a/docker-compose-ali.yml
+++ b/docker-compose-ali.yml
@@ -15,6 +15,8 @@ services:
     ]
     volumes:
       - moneywhere_mysql_data:/var/lib/mysql
+    ports:
+      - "43740:3306"
 
   phpmyadmin:
     image: registry.cn-hangzhou.aliyuncs.com/moneywhere/phpmyadmin:latest
diff --git a/docker-compose-hub.yml b/docker-compose-hub.yml
index c74ad6c..3bf9058 100644
--- a/docker-compose-hub.yml
+++ b/docker-compose-hub.yml
@@ -15,6 +15,8 @@ services:
     ]
     volumes:
       - moneywhere_mysql_data:/var/lib/mysql
+    ports:
+      - "43740:3306"
 
   phpmyadmin:
     image: phpmyadmin/phpmyadmin
diff --git a/docker-compose.yml b/docker-compose.yml
index 7d99402..87299f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,6 +15,8 @@ services:
     ]
     volumes:
       - moneywhere_mysql_data:/var/lib/mysql
+    ports:
+      - "43740:3306"
 
   phpmyadmin:
     image: registry.cn-hangzhou.aliyuncs.com/moneywhere/phpmyadmin:latest
diff --git a/mysql/Dockerfile b/mysql/Dockerfile
deleted file mode 100644
index 3331a8d..0000000
--- a/mysql/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#FROM mysql:5.7
-FROM registry.cn-hangzhou.aliyuncs.com/moneywhere/mysql:5.7
-
-#ARG TZ=UTC
-#ENV TZ ${TIMEZONE}
-#RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ >/etc/timezone && chown -R mysql:root /var/lib/mysql/
-
-COPY my.cnf /etc/mysql/conf.d/my.cnf
-COPY init.sql /data/1.sql
-
-RUN chmod 0444 /etc/mysql/conf.d/my.cnf
-RUN chmod 0444 /data/1.sql
-RUN chown $(whoami) /data/1.sql
-RUN chgrp $(whoami) /data/1.sql
-
-CMD ["mysqld"]
-
-EXPOSE 3306
diff --git a/mysql/init.sql b/mysql/init.sql
deleted file mode 100644
index 6b46dd5..0000000
--- a/mysql/init.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-CREATE DATABASE IF NOT EXISTS moneywhere CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;
-USE moneywhere;
\ No newline at end of file
diff --git a/mysql/my.cnf b/mysql/my.cnf
deleted file mode 100644
index 5591e7d..0000000
--- a/mysql/my.cnf
+++ /dev/null
@@ -1,14 +0,0 @@
-# The MySQL  Client configuration file.
-#
-# For explanations see
-# http://dev.mysql.com/doc/mysql/en/server-system-variables.html
-
-[mysql]
-
-[mysqld]
-character-set-server=utf8mb4
-#default-time-zone='+8:00'
-#innodb_rollback_on_timeout='ON'
-#max_connections=500
-#innodb_lock_wait_timeout=500
-default-authentication-plugin=mysql_native_password
\ No newline at end of file