Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ docker-build: build-server
perl -pi -e "s|image: [a-z0-9.:]+\/deis\/${SHORT_NAME}:[0-9a-z-.]+|image: ${IMAGE}|g" ${RC}
perl -pi -e "s|release: [a-zA-Z0-9.+_-]+|release: ${VERSION}|g" ${RC}

docker-push: docker-build
docker-push:
docker push ${IMAGE}

deploy: build docker-build docker-push kube-rc
Expand Down Expand Up @@ -92,7 +92,8 @@ kube-mc-integration:

# build the minio server
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
# the PWD environment variable is a workaround to ensure that the 'checkdeps' build target works in the minio repo
docker run -e CGO_ENABLED=0 -e GO15VENDOREXPERIMENT=1 -e GOPATH=/go -e GOROOT=/usr/local/go -v ${GOPATH}:/go -w /go/src/github.com/minio/minio -e PWD=/go/src/github.com/minio/minio golang:1.5.2 make

mc-build:
make -C mc build
Expand Down
12 changes: 3 additions & 9 deletions rootfs/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
FROM ubuntu-debootstrap:14.04
FROM alpine:3.3

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 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
RUN apk add -U ca-certificates
COPY . /
USER minio
RUN mkdir /home/minio/.minio
ENV DOCKERIMAGE=1
CMD "boot"
2 changes: 1 addition & 1 deletion server/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,5 @@ mkdir -p $GOPATH/src/github.com/minio
cd $GOPATH/src/github.com/minio
curl -L -O -s https://github.com/minio/minio/archive/master.tar.gz && tar -xvzf master.tar.gz && rm master.tar.gz && mv minio-master minio
cd minio
make install
make
cp $GOPATH/bin/minio /pwd/minio