Skip to content

Commit bf641c5

Browse files
authored
Refactor codes (#15)
* Change dep to go mod. * Update pkg and cmd. * Use the pure client-go library to implement the controller. * Remove unnecessary files.
1 parent 0169474 commit bf641c5

39 files changed

+1202
-1635
lines changed

.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,4 @@
1010
vendor/
1111
out/
1212
tmp/
13-
test.xml
14-
15-
pkg/client/listers/
16-
pkg/client/informers/
13+
test.xml

.travis.yml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,13 @@ sudo: required
44
services:
55
- docker
66
go:
7-
- 1.11.x
7+
- 1.12.x
88
go_import_path: github.com/inwinstack/pa-svc-syncker
9-
before_install:
10-
- go get -u github.com/golang/dep/cmd/dep
9+
env:
10+
- GO111MODULE=on
1111
script:
12-
- make dep
12+
- go mod download
1313
- make test
1414
- make
1515
after_success:
16-
- bash <(curl -s https://codecov.io/bash)
17-
- |
18-
if [[ "$TRAVIS_BRANCH" == release-* ]]; then
19-
# Log into Docker Hub.
20-
docker login -u="$DOCKER_USER" -p="$DOCKER_PASSWORD"
21-
make build_image
22-
make push_image
23-
fi
16+
- bash <(curl -s https://codecov.io/bash)

Dockerfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
# Building stage
2-
FROM inwinstack/golang:1.11-alpine AS build-env
1+
FROM kairen/golang-dep:1.12-alpine AS build
32
LABEL maintainer="Kyle Bai <kyle.b@inwinstack.com>"
43

54
ENV GOPATH "/go"
65
ENV PROJECT_PATH "$GOPATH/src/github.com/inwinstack/pa-svc-syncker"
6+
ENV GO111MODULE "on"
77

88
COPY . $PROJECT_PATH
99
RUN cd $PROJECT_PATH && \
10-
make dep && \
1110
make && mv out/controller /tmp/controller
1211

1312
# Running stage
1413
FROM alpine:3.7
15-
COPY --from=build-env /tmp/controller /bin/controller
16-
ENTRYPOINT ["controller"]
14+
COPY --from=build /tmp/controller /bin/controller
15+
ENTRYPOINT ["controller"]

0 commit comments

Comments
 (0)