This repository was archived by the owner on Dec 5, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +18
-15
lines changed Expand file tree Collapse file tree 2 files changed +18
-15
lines changed Original file line number Diff line number Diff line change @@ -7,7 +7,7 @@ GROUP = weaveworksdemos
7
7
8
8
TAG =$(TRAVIS_COMMIT )
9
9
10
- default : build
10
+ default : docker
11
11
12
12
13
13
pre :
@@ -48,17 +48,14 @@ dockerruntest: dockertestdb dockerdev
48
48
docker run -d --name my$(TESTDB ) -h my$(TESTDB ) $(TESTDB )
49
49
docker run -d --name $(INSTANCE ) -dev -p 8084:8084 --link my$(TESTDB ) -e MONGO_HOST=" my$( TESTDB) :27017" $(INSTANCE ) -dev
50
50
51
- docker : build
52
- cp -rf bin docker/user/
53
- docker build -t $(NAME ) -f docker/user/Dockerfile-release docker/user/
51
+ docker :
52
+ docker build -t $(NAME ) -f docker/user/Dockerfile-release .
54
53
55
- dockerlocal : build
56
- cp -rf bin docker/user/
57
- docker build -t $(INSTANCE ) -local -f docker/user/Dockerfile-release docker/user/
54
+ dockerlocal :
55
+ docker build -t $(INSTANCE ) -local -f docker/user/Dockerfile-release .
58
56
59
- dockertravisbuild : build
60
- cp -rf bin docker/user/
61
- docker build -t $(NAME ) :$(TAG ) -f docker/user/Dockerfile-release docker/user/
57
+ dockertravisbuild :
58
+ docker build -t $(NAME ) :$(TAG ) -f docker/user/Dockerfile-release .
62
59
docker build -t $(DBNAME ) :$(TAG ) -f docker/user-db/Dockerfile docker/user-db/
63
60
if [ -z " $( DOCKER_PASS) " ]; then \
64
61
echo " This is a build triggered by an external PR. Skipping docker push." ; \
@@ -88,7 +85,3 @@ clean: cleandocker
88
85
rm -rf bin
89
86
rm -rf docker/user/bin
90
87
rm -rf vendor
91
-
92
- build : deps
93
- mkdir -p bin
94
- CGO_ENABLED=0 go build -a -installsuffix cgo -o bin/$(INSTANCE ) main.go
Original file line number Diff line number Diff line change
1
+ FROM golang:1.7-alpine
2
+
3
+ COPY . /go/src/github.com/microservices-demo/user/
4
+ WORKDIR /go/src/github.com/microservices-demo/user/
5
+
6
+ RUN apk update
7
+ RUN apk add git
8
+ RUN go get -v github.com/Masterminds/glide
9
+ RUN glide install && CGO_ENABLED=0 go build -a -installsuffix cgo -o /user main.go
10
+
1
11
FROM alpine:3.4
2
12
3
13
ENV SERVICE_USER=myuser \
@@ -15,7 +25,7 @@ ENV MONGO_HOST user-db
15
25
16
26
WORKDIR /
17
27
EXPOSE 80
18
- COPY bin /user /
28
+ COPY --from=0 /user /
19
29
20
30
RUN chmod +x /user && \
21
31
chown -R ${SERVICE_USER}:${SERVICE_GROUP} /user && \
You can’t perform that action at this time.
0 commit comments