Merge pull request #236 from cdr/enable-go-mod-image

deansheather · web-flow · commit 93844eb0f81e · 2019-07-01T15:16:09.000Z
Move GO111MODULE=on to ubuntu-dev-go image
diff --git a/.sail/Dockerfile b/.sail/Dockerfile
@@ -8,8 +8,6 @@ RUN curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.34.0/install.sh | b
 
 LABEL project_root "~/go/src/go.coder.com"
 
-ENV GO111MODULE=on
-
 # Install the latest version of Hugo.
 RUN wget -O /tmp/hugo.deb https://github.com/gohugoio/hugo/releases/download/v0.55.4/hugo_extended_0.55.4_Linux-64bit.deb && \
   sudo dpkg -i /tmp/hugo.deb && \
diff --git a/images/ubuntu-dev-go/Dockerfile.lang b/images/ubuntu-dev-go/Dockerfile.lang
@@ -8,9 +8,10 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH"
 ADD install_go_tools.sh /tmp/
 RUN bash /tmp/install_go_tools.sh
 
+ENV GO111MODULE=on
+
 # This technically has no effect until #35 is resolved.
 RUN installext ms-vscode.go
 
 LABEL share.go_mod "~/go/pkg/mod:~/go/pkg/mod"
 LABEL project_root "~/go/src/"
-
