diff --git a/Makefile b/Makefile index 0ba64ea..731c564 100644 --- a/Makefile +++ b/Makefile @@ -94,8 +94,6 @@ kube-mc-integration: build-server: docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v "${CURDIR}/server":/pwd -w /pwd golang:1.5.2 ./install.sh -# targets for mc - mc-build: make -C mc build diff --git a/mc/Dockerfile b/mc/Dockerfile index 6875ac7..6c05d9d 100644 --- a/mc/Dockerfile +++ b/mc/Dockerfile @@ -1,6 +1,6 @@ -FROM ubuntu-debootstrap:14.04 +FROM alpine:3.3 -RUN apt-get update -y && apt-get install -y -q ca-certificates +RUN apk add -U ca-certificates && rm -rf /var/cache/apk/* ADD mc /bin/mc diff --git a/mc/Makefile b/mc/Makefile index ae848a0..35ba199 100644 --- a/mc/Makefile +++ b/mc/Makefile @@ -7,7 +7,7 @@ MC_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION} MC_INTEGRATION_IMAGE := ${DEIS_REGISTRY}${IMAGE_PREFIX}/mc:${VERSION} build: - docker run -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v ${CURDIR}:/pwd -w /pwd golang:1.5.2 ./install.sh + docker run -e CGO_ENABLED=0 -e GO15VENDOREXPERIMENT=1 -e GOROOT=/usr/local/go --rm -v ${CURDIR}:/pwd -w /pwd golang:1.5.2 ./install.sh docker-build: docker build -t ${MC_IMAGE} ${CURDIR} diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile index 6a12fdb..4a2f239 100644 --- a/rootfs/Dockerfile +++ b/rootfs/Dockerfile @@ -4,14 +4,10 @@ ENV MINIOHOME /home/minio ENV MINIOUSER minio ENV DEIS_RELEASE=2.0.0-dev RUN useradd -m -d $MINIOHOME $MINIOUSER - -RUN apt-get update -y && apt-get install -y -q \ - ca-certificates \ - yasm -RUN apt-get update -y && apt-get install -y -q curl +RUN apt-get update -y && apt-get install -y -q ca-certificates curl RUN curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc RUN chmod 755 /usr/bin/mc COPY . / USER minio RUN mkdir /home/minio/.minio -ENTRYPOINT ["boot"] +CMD "boot"