From e34243ce68c1d7c52887ea50a578bfcec2d2fb27 Mon Sep 17 00:00:00 2001 From: dushixiang Date: Tue, 22 Dec 2020 22:39:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=90=E8=A1=8C=E5=AE=B9?= =?UTF-8?q?=E5=99=A8=E7=9A=84=E5=9F=BA=E7=A1=80=E9=95=9C=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- main.go | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3d84f45..264afb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g' /etc/apk/repositories RUN apk add gcc g++ RUN go env && CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -ldflags '-linkmode external -extldflags "-static"' -o next_terminal main.go -FROM alpine:3.12.3 +FROM guacamole/guacd:1.2.0 LABEL MAINTAINER="helloworld1024@foxmail.com" diff --git a/main.go b/main.go index 6171f1a..7a5a497 100644 --- a/main.go +++ b/main.go @@ -3,9 +3,8 @@ package main import ( "github.com/labstack/gommon/log" "github.com/patrickmn/go-cache" - "gorm.io/driver/mysql" + "gorm.io/driver/sqlite" "gorm.io/gorm" - "gorm.io/gorm/logger" "next-terminal/pkg/api" "next-terminal/pkg/config" "next-terminal/pkg/handle" @@ -23,10 +22,10 @@ func Run() error { config.NextTerminal = config.SetupConfig() var err error - config.DB, err = gorm.Open(mysql.Open(config.NextTerminal.Dsn), &gorm.Config{ - Logger: logger.Default.LogMode(logger.Info), - }) - //config.DB, err = gorm.Open(sqlite.Open("next-terminal.db"), &gorm.Config{}) + //config.DB, err = gorm.Open(mysql.Open(config.NextTerminal.Dsn), &gorm.Config{ + // Logger: logger.Default.LogMode(logger.Info), + //}) + config.DB, err = gorm.Open(sqlite.Open("next-terminal.db"), &gorm.Config{}) if err != nil { log.Fatal("连接数据库异常", err) }