提交合并

-<<<<<<< HEAD
-FROM 192.168.0.243:5000/mmm/partnermg:base
-#FROM golang:latest
-=======
 FROM 192.168.0.243:5000/mmm/mmm-partnermg:base
 FROM 192.168.0.243:5000/mmm/mmm-partnermg:base
->>>>>>> b7c9bf2b68184540a3ae1a356b0384e4a6ee90ff
 ENV APP_DIR $GOPATH/src/partnermg
 ENV APP_DIR $GOPATH/src/partnermg
 RUN mkdir -p $APP_DIR
 RUN mkdir -p $APP_DIR
 WORKDIR $APP_DIR/
 WORKDIR $APP_DIR/