diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml new file mode 100644 index 000000000..c681eac73 --- /dev/null +++ b/docker/docker-compose.yml @@ -0,0 +1,43 @@ +version: '3' +services: + mysql: + image: maxkey:mysql + container_name: mysql + build: ./docker-mysql + volumes: + - /root/mysql/data:/var/lib/mysql + - /root/mysql/logs:/var/log/mysql + - /root/docker-mysql:/etc/mysql/conf.d + - /root/docker-mysql/sql:/docker-entrypoint-initdb.d + environment: + - MYSQL_ROOT_PASSWORD=maxkey + ports: + - "3306:3306" + restart: always + command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci + + maxkey: + image: maxkey:maxkey + container_name: maxkey + build: ./docker-maxkey + environment: + - DATABASE_HOST:192.168.0.102 + - DATABASE_PORT:3306 + - DATABASE_NAME:maxkey + - DATABASE_USER:root + - DATABASE_PWD:maxkey + ports: + - "443:443" + + maxkey-mgt: + image: maxkey:maxkey-mgt + container_name: maxkey-mgt + build: ./docker-maxkey-mgt + environment: + - DATABASE_HOST:192.168.0.102 + - DATABASE_PORT:3306 + - DATABASE_NAME:maxkey + - DATABASE_USER:root + - DATABASE_PWD:maxkey + ports: + - "9527:9527" \ No newline at end of file diff --git a/docker/docker-maxkey-mgt/Dockerfile b/docker/docker-maxkey-mgt/Dockerfile new file mode 100644 index 000000000..c30fc7be1 --- /dev/null +++ b/docker/docker-maxkey-mgt/Dockerfile @@ -0,0 +1,8 @@ +FROM maxkeytop/maxkey-mgt:latest + +ENV TZ=Asia/Shanghai \ + DATABASE_HOST=192.168.0.102 \ + DATABASE_PORT=3306 \ + DATABASE_NAME=maxkey \ + DATABASE_USER=root \ + DATABASE_PWD=maxkey \ \ No newline at end of file diff --git a/docker/docker-maxkey/Dockerfile b/docker/docker-maxkey/Dockerfile new file mode 100644 index 000000000..3c6826b73 --- /dev/null +++ b/docker/docker-maxkey/Dockerfile @@ -0,0 +1,8 @@ +FROM maxkeytop/maxkey:latest + +ENV TZ=Asia/Shanghai \ + DATABASE_HOST=192.168.0.102 \ + DATABASE_PORT=3306 \ + DATABASE_NAME=maxkey \ + DATABASE_USER=root \ + DATABASE_PWD=maxkey \ \ No newline at end of file diff --git a/sql/docker-mysql/Dockerfile b/docker/docker-mysql/Dockerfile similarity index 100% rename from sql/docker-mysql/Dockerfile rename to docker/docker-mysql/Dockerfile diff --git a/sql/docker-mysql/LICENSE b/docker/docker-mysql/LICENSE similarity index 100% rename from sql/docker-mysql/LICENSE rename to docker/docker-mysql/LICENSE diff --git a/sql/docker-mysql/README.md b/docker/docker-mysql/README.md similarity index 100% rename from sql/docker-mysql/README.md rename to docker/docker-mysql/README.md diff --git a/sql/docker-mysql/mysqld.cnf b/docker/docker-mysql/mysqld.cnf similarity index 100% rename from sql/docker-mysql/mysqld.cnf rename to docker/docker-mysql/mysqld.cnf diff --git a/sql/docker-mysql/sql/.keep b/docker/docker-mysql/sql/.keep similarity index 100% rename from sql/docker-mysql/sql/.keep rename to docker/docker-mysql/sql/.keep diff --git a/sql/docker-mysql/sql/init.sql b/docker/docker-mysql/sql/init.sql similarity index 100% rename from sql/docker-mysql/sql/init.sql rename to docker/docker-mysql/sql/init.sql diff --git a/sql/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql b/docker/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql similarity index 100% rename from sql/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql rename to docker/docker-mysql/sql/v2.9.0.ga/init_v2.9.0.ga.sql diff --git a/sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql b/docker/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql rename to docker/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA.sql diff --git a/sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql b/docker/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql rename to docker/docker-mysql/sql/v2.9.0.ga/maxkey_v2.9.0.GA_data.sql diff --git a/sql/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql b/docker/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql similarity index 100% rename from sql/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql rename to docker/docker-mysql/sql/v3.0.0.ga/init_v3.0.0.ga.sql diff --git a/sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql b/docker/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql rename to docker/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA.sql diff --git a/sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql b/docker/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql rename to docker/docker-mysql/sql/v3.0.0.ga/maxkey_v3.0.0.GA_data.sql diff --git a/sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql b/docker/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql similarity index 100% rename from sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql rename to docker/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA.sql diff --git a/sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql b/docker/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql similarity index 100% rename from sql/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql rename to docker/docker-mysql/sql/v3.1.0.ga/maxkey_v3.1.0.GA_data.sql