File tree Expand file tree Collapse file tree 16 files changed +564
-6
lines changed Expand file tree Collapse file tree 16 files changed +564
-6
lines changed Original file line number Diff line number Diff line change 4
4
# vendored sources -- these are synced by govendor
5
5
vendor /* /
6
6
7
- aws /dockerfiles /files /bin /buoy
7
+ aws /dockerfiles /files /bin /*
8
8
aws /dockerfiles /files /elb-controller /container /bin /*
9
- azure /dockerfiles /files /bin /buoy
9
+ azure /dockerfiles /files /bin /*
10
10
azure /dockerfiles /files /alb-controller /container /bin /*
11
11
tools /buoy /bin /buoy
12
12
aws /release /tmp
13
- aws /dockerfiles /files /bin /buoy
14
- azure /dockerfiles /files /bin /buoy
15
13
azure /release /tmp
16
14
tools /buoy /bin /buoy
15
+ tools /metaserver /bin /metaserver
17
16
* ~
18
17
* #
19
18
. # *
Original file line number Diff line number Diff line change
1
+ FROM alpine:3.4
2
+
3
+ RUN apk add --update ca-certificates && rm -Rf /tmp/* /var/lib/cache/apk/*
4
+
5
+ # needed in order for go binary to work.
6
+ RUN mkdir /lib64 && ln -s /lib/libc.musl-x86_64.so.1 /lib64/ld-linux-x86-64.so.2
7
+
8
+ ADD files/bin/metaserver /usr/local/bin/
9
+
10
+ CMD [ "metaserver" ]
Original file line number Diff line number Diff line change 5
5
NAMESPACE=" ${NAMESPACE:- docker4x} "
6
6
VERSION=" ${VERSION:- latest} "
7
7
8
- for IMAGE in shell init guide ddc-init cloud
8
+ for IMAGE in shell init guide ddc-init cloud meta
9
9
do
10
10
FINAL_IMAGE=" ${NAMESPACE} /${IMAGE} -aws:${VERSION} "
11
11
docker build -t " ${FINAL_IMAGE} " -f " Dockerfile.${IMAGE} " .
Original file line number Diff line number Diff line change @@ -172,6 +172,10 @@ echo "= Build Buoy ="
172
172
cd ../../tools/buoy
173
173
./build_buoy.sh
174
174
175
+ echo " = Build Metaserver ="
176
+ cd ../metaserver
177
+ ./build.sh
178
+
175
179
cd $BASE_DIR
176
180
cd ../dockerfiles
177
181
Original file line number Diff line number Diff line change @@ -78,6 +78,9 @@ export VERSION=aws-v$DOCKER_VERSION-$EDITION_VERSION
78
78
cd $BUILD_HOME /code/editions/tools/buoy/
79
79
./build_buoy.sh
80
80
81
+ cd $BUILD_HOME /code/editions/tools/metaserver/
82
+ ./build.sh
83
+
81
84
cd $BUILD_HOME /code/editions/aws/dockerfiles/
82
85
83
86
# build images
Original file line number Diff line number Diff line change @@ -113,6 +113,9 @@ CURRPATH=`pwd`
113
113
cd ../../tools/buoy/
114
114
./build_buoy.sh
115
115
116
+ cd ../metaserver/
117
+ ./build.sh
118
+
116
119
echo " === CURRPATH=$CURRPATH ==="
117
120
# back to release dir
118
121
cd $CURRPATH
Original file line number Diff line number Diff line change 1
- FROM golang:1.6.2
1
+ FROM golang:1.6.3
2
2
3
3
RUN go get github.com/segmentio/analytics-go
4
4
Original file line number Diff line number Diff line change
1
+ FROM golang:1.7
2
+
3
+ RUN go get github.com/docker/docker/client
4
+ RUN go get github.com/aws/aws-sdk-go
5
+ RUN go get github.com/docker/docker/api/types
6
+ RUN go get github.com/docker/go-connections/tlsconfig
7
+ RUN go get github.com/docker/go-connections/sockets
8
+ RUN go get github.com/gorilla/mux
9
+
10
+ ENV USER root
11
+ WORKDIR /go/
12
+
13
+ COPY . ./
14
+ RUN mkdir -p bin
15
+
16
+ CMD ["/compile.sh" ]
Original file line number Diff line number Diff line change
1
+ default : build
2
+
3
+ build :
4
+ ./build.sh
Original file line number Diff line number Diff line change
1
+ #! /bin/bash
2
+
3
+ set -e
4
+
5
+ DOCKER_IMAGE_NAME=" metaserver"
6
+ DOCKER_CONTAINER_NAME=" metaserver-build-container"
7
+
8
+ if [[ $( docker ps -a | grep $DOCKER_CONTAINER_NAME ) != " " ]]; then
9
+ echo " remove $DOCKER_CONTAINER_NAME "
10
+ docker rm -f $DOCKER_CONTAINER_NAME
11
+ fi
12
+
13
+ docker build -t $DOCKER_IMAGE_NAME .
14
+
15
+ docker run --name $DOCKER_CONTAINER_NAME $DOCKER_IMAGE_NAME ./compile.sh
16
+
17
+ mkdir -p bin
18
+ docker cp $DOCKER_CONTAINER_NAME :/go/bin/metaserver bin/metaserver
19
+
20
+ mkdir -p ../../aws/dockerfiles/files/bin/ ../../azure/dockerfiles/files/bin/
21
+ rm -f ../../aws/dockerfiles/files/bin/metaserver ../../azure/dockerfiles/files/bin/metaserver
22
+ cp bin/metaserver ../../aws/dockerfiles/files/bin/metaserver
23
+ cp bin/metaserver ../../azure/dockerfiles/files/bin/metaserver
24
+
25
+ if [[ $( docker ps -a | grep $DOCKER_CONTAINER_NAME ) != " " ]]; then
26
+ echo " remove $DOCKER_CONTAINER_NAME "
27
+ docker rm -f $DOCKER_CONTAINER_NAME
28
+ fi
You can’t perform that action at this time.
0 commit comments