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
10 changes: 1 addition & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -38,22 +38,14 @@ build:
test:
${DEV_ENV_CMD} go test ${TEST_PACKAGES}

docker-build: build build-server
# copy the server binary from where it was built to the final image's file system.
# note that the minio server is built as a dependency of this build target.
cp server/minio ${BINDIR}

docker-build: build
# build the main image
docker build --rm -t ${IMAGE} rootfs
docker tag -f ${IMAGE} ${MUTABLE_IMAGE}


deploy: build docker-build docker-push kube-rc

# 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.6 ./install.sh

mc-build:
make -C mc build

Expand Down
4 changes: 3 additions & 1 deletion rootfs/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ COPY . /
RUN curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.OFFICIAL.2015-09-05T23-43-46Z -o /usr/bin/mc \
&& chmod 755 /usr/bin/mc \
&& mkdir /home/minio/.minio \
&& chown minio:minio /home/minio/.minio
&& chown minio:minio /home/minio/.minio \
&& curl https://dl.minio.io/server/minio/release/linux-amd64/minio.RELEASE.2016-04-17T22-09-24Z > /bin/minio \
&& chmod 755 bin/minio

USER minio

Expand Down
21 changes: 0 additions & 21 deletions server/install.sh

This file was deleted.