From 5e6739cd099c8f01b89a4f234eb9e8a5647b2ebd Mon Sep 17 00:00:00 2001 From: Max Date: Tue, 21 Dec 2021 09:20:52 +0800 Subject: [PATCH] + Docker Image --- Makefile | 2 +- docker/mysql-8.0/Dockerfile | 21 +++++++++++++++++++++ docker/mysql-8.0/conf/mysqld.conf | 11 +++++++++++ docker/mysql-8.0/conf/yao.conf | 11 +++++++++++ docker/mysql-8.0/conf/yao.env | 19 +++++++++++++++++++ docker/yao/Dockerfile | 20 ++++++++++++++++++++ docker/yao/conf/yao.conf | 11 +++++++++++ docker/yao/conf/yao.env | 14 ++++++++++++++ 8 files changed, 108 insertions(+), 1 deletion(-) create mode 100644 docker/mysql-8.0/Dockerfile create mode 100644 docker/mysql-8.0/conf/mysqld.conf create mode 100644 docker/mysql-8.0/conf/yao.conf create mode 100644 docker/mysql-8.0/conf/yao.env create mode 100644 docker/yao/Dockerfile create mode 100644 docker/yao/conf/yao.conf create mode 100644 docker/yao/conf/yao.env diff --git a/Makefile b/Makefile index 9ee09a80..a677e795 100644 --- a/Makefile +++ b/Makefile @@ -169,7 +169,7 @@ release: clean sed "s/*.iqka.com/$(XIANG_DOMAIN)/g" dist/release/share/const.go.bak > dist/release/share/const.go; \ fi; - cd dist/release && GOOS=linux GOARCH=amd64 go build -v -o ../../.tmp/xiang-${VERSION}-linux-amd64 + cd dist/release && CGO_ENABLED=1 CC=x86_64-linux-musl-gcc CGO_LDFLAGS="-static" GOOS=linux GOARCH=amd64 go build -v -o ../../.tmp/xiang-${VERSION}-linux-amd64 # cd dist/release && GOOS=linux GOARCH=arm GOARM=7 go build -v -o ../../.tmp/xiang-${VERSION}-linux-arm # cd dist/release && GOOS=linux GOARCH=arm64 GOARM=7 go build -v -o ../../.tmp/xiang-${VERSION}-linux-arm64 cd dist/release && GOOS=darwin GOARCH=amd64 go build -v -o ../../.tmp/xiang-${VERSION}-darwin-amd64 diff --git a/docker/mysql-8.0/Dockerfile b/docker/mysql-8.0/Dockerfile new file mode 100644 index 00000000..12c91bbc --- /dev/null +++ b/docker/mysql-8.0/Dockerfile @@ -0,0 +1,21 @@ +# =========================================== +# Yao 0.9.11 + MySQL 8.0.27 +# docker build -t yaoapp/yao-mysql:0.9.11 . +# =========================================== +FROM mysql:8.0.27 +ENV MYSQL_ROOT_PASSWORD=123456 MYSQL_DATABASE=yao +RUN groupadd -r yao && useradd -r -g yao yao +RUN sed -i 's#http://deb.debian.org#http://mirrors.163.com#g' /etc/apt/sources.list +RUN apt-get update && apt-get install -y curl supervisor sudo procps net-tools +RUN mkdir -p /data/app && mkdir -p /data/app/db && mkdir -p /data/logs && chown -R yao:yao /data +RUN echo user=root >> /etc/supervisor/supervisord.conf +RUN curl -fsSL https://demo-crm.iqka.com/releases/0.9.11/install.sh | bash + +COPY conf/yao.conf /etc/supervisor/conf.d/yao.conf +# COPY conf/yao.env /data/app/.env +COPY conf/mysqld.conf /etc/supervisor/conf.d/mysqld.conf + +VOLUME /data/app +EXPOSE 3306 33060 5099 3321 +ENTRYPOINT ["docker-entrypoint.sh"] +CMD ["/usr/bin/supervisord", "-n"] diff --git a/docker/mysql-8.0/conf/mysqld.conf b/docker/mysql-8.0/conf/mysqld.conf new file mode 100644 index 00000000..8c8c32bf --- /dev/null +++ b/docker/mysql-8.0/conf/mysqld.conf @@ -0,0 +1,11 @@ +[program:mysqld] +directory=/ +command=mysqld +process_name=mysqld +numprocs=1 +autostart=true +autorestart=true +user=mysql +group=mysql +redirect_stderr=true +stdout_logfile=/data/logs/mysqld-supervisor.log diff --git a/docker/mysql-8.0/conf/yao.conf b/docker/mysql-8.0/conf/yao.conf new file mode 100644 index 00000000..7f9abd04 --- /dev/null +++ b/docker/mysql-8.0/conf/yao.conf @@ -0,0 +1,11 @@ +[program:yao-server] +directory=/data/app +command=/usr/local/bin/yao start +process_name=yao-server +numprocs=1 +autostart=true +autorestart=true +user=yao +group=yao +redirect_stderr=true +stdout_logfile=/data/logs/yao-supervisor.log diff --git a/docker/mysql-8.0/conf/yao.env b/docker/mysql-8.0/conf/yao.env new file mode 100644 index 00000000..bc6a6db2 --- /dev/null +++ b/docker/mysql-8.0/conf/yao.env @@ -0,0 +1,19 @@ +XIANG_MODE="debug" + +# 服务器配置 +XIANG_SERVICE_HOST=0.0.0.0 +XIANG_SERVICE_PORT=5099 +XIANG_SESSION_PORT=3321 + +# 数据库配置 +XIANG_DB_DEBUG=true +XIANG_DB_AESKEY="ZLX=T&f6refeCh-ro*r@" + +# 数据库 +XIANG_DB_DRIVER=mysql +XIANG_DB_PRIMARY="root:123456@tcp(127.0.0.1:3306)/yao?charset=utf8mb4&parseTime=True&loc=Local" +XIANG_DB_SECONDARY="root:123456@tcp(127.0.0.1:3306)/yao?charset=utf8mb4&parseTime=True&loc=Local" + +# JWT配置 +XIANG_JWT_DEBUG=true +XIANG_JWT_SECRET="bLp@bi!oqo-2U+hoTRUG" \ No newline at end of file diff --git a/docker/yao/Dockerfile b/docker/yao/Dockerfile new file mode 100644 index 00000000..657ffe9a --- /dev/null +++ b/docker/yao/Dockerfile @@ -0,0 +1,20 @@ +# =========================================== +# Yao 0.9.11 + MySQL 8.0.27 +# docker build -t yaoapp/yao:0.9.11 . +# =========================================== +FROM debian:buster-slim +RUN groupadd -r yao && useradd -r -g yao yao +RUN sed -i 's#http://deb.debian.org#http://mirrors.163.com#g' /etc/apt/sources.list && \ + apt-get update && apt-get install -y curl supervisor sudo procps net-tools && \ + mkdir -p /data/app && \ + mkdir -p /data/logs && \ + mkdir -p /data/app/db && \ + chown -R yao:yao /data && \ + echo user=root >> /etc/supervisor/supervisord.conf && \ + curl -fsSL https://demo-crm.iqka.com/releases/0.9.11/install.sh | bash + +COPY conf/yao.conf /etc/supervisor/conf.d/yao.conf +COPY conf/yao.env /data/app/.env +VOLUME /data/app +EXPOSE 5099 3321 +CMD ["/usr/bin/supervisord", "-n"] diff --git a/docker/yao/conf/yao.conf b/docker/yao/conf/yao.conf new file mode 100644 index 00000000..7f9abd04 --- /dev/null +++ b/docker/yao/conf/yao.conf @@ -0,0 +1,11 @@ +[program:yao-server] +directory=/data/app +command=/usr/local/bin/yao start +process_name=yao-server +numprocs=1 +autostart=true +autorestart=true +user=yao +group=yao +redirect_stderr=true +stdout_logfile=/data/logs/yao-supervisor.log diff --git a/docker/yao/conf/yao.env b/docker/yao/conf/yao.env new file mode 100644 index 00000000..a2e789e6 --- /dev/null +++ b/docker/yao/conf/yao.env @@ -0,0 +1,14 @@ +XIANG_MODE="debug" + +# 服务器配置 +XIANG_SERVICE_HOST=0.0.0.0 +XIANG_SERVICE_PORT=5099 +XIANG_SESSION_PORT=3321 + +# 数据库配置 +XIANG_DB_DEBUG=true +XIANG_DB_AESKEY="ZLX=T&f6refeCh-ro*r@" + +# JWT配置 +XIANG_JWT_DEBUG=true +XIANG_JWT_SECRET="bLp@bi!oqo-2U+hoTRUG" \ No newline at end of file