Skip to content

Commit 982aaaa

Browse files
authored
ENH: Uses go 1.11 modules (#72)
1 parent 4665513 commit 982aaaa

28 files changed

Lines changed: 114 additions & 46 deletions

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ADD . /src
33
WORKDIR /src
44
RUN set -x \
55
&& apk add --update --no-cache --no-progress git g++ \
6-
&& go get -d -v -t \
6+
&& go get -d -v \
77
&& go test --cover ./... --run UnitTest \
88
&& go build -v -o docker-flow-proxy
99

Dockerfile.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM dockerflow/docker-flow-proxy-test-base
1+
FROM thomasjpfan/docker-flow-proxy-test-base
22

33
COPY . /src
44
WORKDIR /src
55
RUN chmod +x /src/run-tests.sh
6-
RUN go get -d -v -t
6+
RUN go get -d -v
77

88
CMD ["sh", "-c", "/src/run-tests.sh"]

Dockerfile.test-base

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
FROM golang:1.8
1+
FROM golang:1.11.0-alpine3.8
22

3-
MAINTAINER Viktor Farcic <viktor@farcic.com>
4-
5-
RUN apt-get update && \
6-
apt-get install -y apt-transport-https ca-certificates curl software-properties-common expect && \
7-
curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - && \
8-
add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/debian $(lsb_release -cs) stable" && \
9-
apt-get update && \
10-
apt-get -y install docker-ce
3+
RUN apk add --no-cache --update git docker gcc libc-dev

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pipeline {
1515
def dateFormat = new SimpleDateFormat("yy.MM.dd")
1616
currentBuild.displayName = dateFormat.format(new Date()) + "-" + env.BUILD_NUMBER
1717
}
18-
dfBuild2("docker-flow-proxy")
18+
dfBuild2("docker-flow-proxy", "thomasjpfan/gox-build:0.1.1-1.11.0-alpine3.8")
1919
sh "docker image build -t dockerflow/docker-flow-proxy:latest-packet-beat -f Dockerfile.packetbeat ."
2020
sh "docker image tag dockerflow/docker-flow-proxy:latest-packet-beat dockerflow/docker-flow-proxy:${currentBuild.displayName}-packet-beat"
2121
}

actions/fetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net/http"
77
"strings"
88

9-
"../proxy"
9+
"github.com/docker-flow/docker-flow-proxy/proxy"
1010
)
1111

1212
// Fetchable defines interface that fetches information from other sources

actions/fetch_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"strings"
1010
"testing"
1111

12-
"../proxy"
12+
"github.com/docker-flow/docker-flow-proxy/proxy"
1313
"github.com/stretchr/testify/suite"
1414
)
1515

actions/reconfigure.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"strconv"
99
"strings"
1010

11-
"../proxy"
11+
"github.com/docker-flow/docker-flow-proxy/proxy"
1212
)
1313

1414
const serviceTemplateFeFilename = "service-formatted-fe.ctmpl"

actions/reconfigure_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66
"testing"
77

8-
"../proxy"
8+
"github.com/docker-flow/docker-flow-proxy/proxy"
99
"github.com/stretchr/testify/mock"
1010
"github.com/stretchr/testify/suite"
1111
)

actions/reload.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package actions
22

33
import (
4-
"../proxy"
4+
"github.com/docker-flow/docker-flow-proxy/proxy"
55
)
66

77
// Reloader defines the interface for reloading HAProxy

actions/reload_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package actions
22

33
import (
4-
"../proxy"
4+
"github.com/docker-flow/docker-flow-proxy/proxy"
55
"fmt"
66
"github.com/stretchr/testify/suite"
77
"testing"

0 commit comments

Comments
 (0)