From cd61774707f1e025da827be12a9172ab498f0acc Mon Sep 17 00:00:00 2001 From: xewk Date: Sat, 6 Jan 2018 15:43:39 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E5=9B=A0=E7=BC=96=E8=AF=91=E9=81=87?= =?UTF-8?q?=E5=88=B0=E9=97=AE=E9=A2=98=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=9E=E6=9D=A5=E4=BA=86=EF=BC=8C=E5=90=8E?= =?UTF-8?q?=E6=9C=9F=E5=AD=A6=E4=B9=A0go=E7=9F=A5=E8=AF=86=E6=9D=A5?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=96=B0=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 4 ---- .gitattributes | 3 ++- Dockerfile | 4 ++-- docker-compose.yml | 3 --- start.sh | 6 +++--- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.env b/.env index 96e01f1f..ef4b28ca 100644 --- a/.env +++ b/.env @@ -2,10 +2,6 @@ # General Setup ########################################################### -### Application Path ################################################################################################### -# Point to your code, will be available at `/var/www/mindoc`. - -APPLICATION=../mindoc_volume/ ### GLOBAL ENVIRONMENT ################################################################################################# diff --git a/.gitattributes b/.gitattributes index 5f9e9e73..46f6011d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,3 @@ *.js linguist-language=Go -*.css linguist-language=Go \ No newline at end of file +*.css linguist-language=Go +./.env \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 84668de8..92d63653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,9 +7,9 @@ RUN cp /etc/apk/repositories /etc/apk/repositories.back && \ RUN apk add --update bash git make gcc g++ -ADD . /var/www/mindoc +ADD . /go/src/github.com/lifei6671/mindoc -WORKDIR /var/www/mindoc +WORKDIR /go/src/github.com/lifei6671/mindoc RUN chmod +x start.sh diff --git a/docker-compose.yml b/docker-compose.yml index 547e2434..8c27ac91 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,9 +6,6 @@ services: applications: image: tianon/true - volumes: - - ${APPLICATION}:/var/www/mindoc - ### Workspace Utilities Container ########################### mindoc: diff --git a/start.sh b/start.sh index 0a5cebf2..7ccac13f 100644 --- a/start.sh +++ b/start.sh @@ -1,7 +1,7 @@ #!/bin/sh set -e -cd /var/www/mindoc +cd /go/src/github.com/lifei6671/mindoc/ if [ ! -f "conf/app.conf" ] ; then cp conf/app.conf.example conf/app.conf @@ -45,6 +45,6 @@ fi sed -i 's/^runmode.*/runmode=prod/g' conf/app.conf -/var/www/mindoc/mindoc_linux_amd64 install +/go/src/github.com/lifei6671/mindoc/mindoc_linux_amd64 install -/var/www/mindoc/mindoc_linux_amd64 \ No newline at end of file +/go/src/github.com/lifei6671/mindoc/mindoc_linux_amd64 \ No newline at end of file