From aa339f6e951208b415a16dd726264f4fc5bfd207 Mon Sep 17 00:00:00 2001 From: eryajf Date: Wed, 1 Jun 2022 17:56:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9dockerfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 ++++-- config.yml | 2 +- docs/docker-compose/docker-compose.yaml | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7ba5968..f660636 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,13 @@ FROM golang:1.17.10 AS builder -ENV GOPROXY https://goproxy.io +# ENV GOPROXY https://goproxy.io RUN mkdir /app ADD . /app/ WORKDIR /app -RUN go build -o go-ldap-admin . +RUN sed -i 's@host: localhost@host: mysql@g' config.yml \ + && sed -i 's@localhost:389@openldap:389@g' config.yml \ + && go build -o go-ldap-admin . FROM centos:centos7 RUN mkdir /app diff --git a/config.yml b/config.yml index 9c8cb12..cd017f4 100644 --- a/config.yml +++ b/config.yml @@ -38,7 +38,7 @@ mysql: host: localhost # 端口 port: 3306 - # 连接字56参数 + # 连接字符串参数 query: parseTime=True&loc=Local&timeout=10000ms # 是否打印日志 log-mode: true diff --git a/docs/docker-compose/docker-compose.yaml b/docs/docker-compose/docker-compose.yaml index 510e56e..15c74c8 100644 --- a/docs/docker-compose/docker-compose.yaml +++ b/docs/docker-compose/docker-compose.yaml @@ -67,7 +67,7 @@ services: - go-ldap-admin go-ldap-admin-server: - image: docker.mirrors.sjtug.sjtu.edu.cn/eryajf/go-ldap-admin + image: docker.mirrors.sjtug.sjtu.edu.cn/eryajf/go-ldap-admin-server container_name: go-ldap-admin-server hostname: go-ldap-admin-server restart: always @@ -75,7 +75,6 @@ services: TZ: Asia/Shanghai WAIT_HOSTS: mysql:3306, openldap:389 ports: - - 8090:80 - 8888:8888 depends_on: - mysql