Skip to content

Commit 6581ac1

Browse files
authored
Merge pull request #530 from intel-go/gregory/hotfix
Fixed checksum of docker dependency and updated build instructions
2 parents 3c791dd + 6ea975d commit 6581ac1

File tree

4 files changed

+13
-26
lines changed

4 files changed

+13
-26
lines changed

Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN apt-get -q update && apt-get -q -y install \
1919
libhyperscan-dev \
2020
liblua5.3-dev
2121

22-
RUN cd /opt && curl -L -s https://dl.google.com/go/go1.11.2.linux-amd64.tar.gz | tar zx
22+
RUN cd /opt && curl -L -s https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz | tar zx
2323

2424
RUN mkdir -p ${NFF_GO}
2525
COPY . ${NFF_GO}

README.md

+10-23
Original file line numberDiff line numberDiff line change
@@ -75,22 +75,6 @@ sources use the following command
7575

7676
git clone --recurse-submodules http://github.com/intel-go/nff-go
7777

78-
### Working with a github fork
79-
80-
If you are working on a fork, then the **go get** command will not put nff-go in
81-
$GOPATH/src/github.com/intel-go. However, imports will continue to reference
82-
github.com/intel-go. This is a feature of Go and not a problem in the way nff-go
83-
is written. See [stackoverflow
84-
article](https://stackoverflow.com/questions/14323872/using-forked-package-import-in-go)
85-
for a discussion. A simple way to resolve the problem is to use a symlink. If
86-
you are rscohn2 on github, and you forked nff-go into your personal account,
87-
then do this:
88-
89-
cd $GOPATH/src/github.com
90-
mkdir intel-go
91-
cd intel-go
92-
ln -s ../rscohn2/nff-go .
93-
9478
## Setting up the build and run environment
9579

9680
### DPDK
@@ -115,13 +99,21 @@ $GOPATH/src/github.com/intel-go/nff-go/test/dpdk/dpdk-17.08/x86_64-native-linuxa
11599

116100
### Go
117101

118-
Use Go version 1.11 or higher. To check the version of Go, do:
102+
Use Go version 1.11.4 or higher. To check the version of Go, do:
119103

120104
go version
121105
122106
## Building NFF-GO
123107

124-
cd $GOPATH/src/github.com/intel-go/nff-go
108+
When Go compiler runs for the first time it downloads all dependent
109+
packages listed in `go.mod` file. This operation cannot be done in
110+
parallel because otherwise Go package cache gets corrupted. Because of
111+
that it is necessary to run command `go mod download` before first
112+
`make` is done. Another option is to use single process `make -j1`
113+
when it is run for the first time, but may be quite slow.
114+
115+
cd nff-go
116+
go mod download # do it once before first build
125117
make -j8
126118

127119
## Building NFF-GO in debug mode
@@ -183,11 +175,6 @@ in these JSON files.
183175
To clean all generated binaries, use the **make clean** command. To delete all
184176
deployed images listed in NFF_GO_HOSTS, use the **make cleanall** command.
185177

186-
## Changing the DPDK sources
187-
188-
If you use the **make** command from NFF-GO directories, the DPDK driver is
189-
downloaded automatically.
190-
191178
## Contributing
192179

193180
If you want to contribute to NFF-Go, check our [Contributing

go.sum

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
github.com/docker/distribution v2.6.2+incompatible h1:4FI6af79dfCS/CYb+RRtkSHw3q1L/bnDjG1PcPZtQhM=
22
github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
3-
github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M=
3+
github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
44
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
55
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
66
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=

vagrant/Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ echo Reassigning "${syscon}" interface to system name
125125
sudo nmcli c mod "${syscon}" connection.id 'System connection'
126126
127127
echo Unpacking Go language into /opt
128-
(cd /opt; sudo sh -c 'curl -L -s https://dl.google.com/go/go1.11.2.linux-amd64.tar.gz | tar zx')
128+
(cd /opt; sudo sh -c 'curl -L -s https://dl.google.com/go/go1.11.4.linux-amd64.tar.gz | tar zx')
129129
mkdir go
130130
chmod +x ~/scripts.sh
131131
. ~/scripts.sh

0 commit comments

Comments
 (0)