Skip to content

Commit 30af3d6

Browse files
authored
fixed go module in GSKY docker build (#524)
1 parent 46b0bf7 commit 30af3d6

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

docker/build_gsky.sh

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,28 +7,20 @@ C_INCLUDE_PATH=$(nc-config --includedir)
77
export C_INCLUDE_PATH
88

99
wget -q -O go.tar.gz https://dl.google.com/go/go1.16.3.linux-amd64.tar.gz
10-
tar -xf go.tar.gz
10+
rm -rf go && tar -xf go.tar.gz && rm -f go.tar.gz
1111

12-
mkdir /gopath
1312
export GOROOT=/go
14-
export GOPATH=/gopath
13+
export GOPATH=/gsky/gopath
1514
export PATH="$PATH:$GOROOT/bin"
1615

17-
(set -xeu
18-
go get github.com/nci/gsky
19-
if [ "$gsky_repo" != "$DEFAULT_GSKY_REPO" ]
20-
then
21-
rm -rf $GOPATH/src/github.com/nci/gsky
22-
git clone "$gsky_repo" $GOPATH/src/github.com/nci/gsky
23-
fi
16+
rm -rf $GOPATH && mkdir $GOPATH
17+
git clone "$gsky_repo" $GOPATH/src/github.com/nci/gsky
2418

19+
(set -xeu
2520
cd $GOPATH/src/github.com/nci/gsky
2621

2722
mkdir -p /gsky
2823
./configure --prefix=/gsky --bindir=/gsky/bin --sbindir=/gsky/bin --libexecdir=/gsky/bin
2924
make all
3025
make install
3126
)
32-
33-
rm -f go.tar.gz
34-
rm -rf gopath

0 commit comments

Comments
 (0)