Skip to content

chore(Makefile,rootfs/Dockerfile,server/install.sh): use official minio release #75

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
arschles wants to merge 1 commit into from
Closed

chore(Makefile,rootfs/Dockerfile,server/install.sh): use official minio release #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,7 @@ build:
test:
${DEV_ENV_CMD} go test ${TEST_PACKAGES}

docker-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 the main image
docker build --rm -t ${IMAGE} rootfs
# These are both YAML specific
Expand Down Expand Up @@ -98,10 +94,6 @@ kube-mc:
kube-mc-integration:
kubectl create -f manifests/deis-mc-integration-pod.yaml

# 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

mc-build:
make -C mc build

Expand Down
10 changes: 6 additions & 4 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,12 @@ FROM ubuntu:14.04
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 useradd -m -d $MINIOHOME $MINIOUSER && \
apt-get update -y && \
apt-get install -y -q ca-certificates curl && \
curl -f -SL https://dl.minio.io:9000/updates/2015/Sept/linux-amd64/mc -o /usr/bin/mc && \
chmod 755 /usr/bin/mc && \
curl -f -SL https://dl.minio.io/server/minio/release/linux-amd64/minio.OFFICIAL.2016-02-08T00-12-28Z -o /bin/minio
COPY . /
USER minio
RUN mkdir /home/minio/.minio
Expand Down
17 changes: 0 additions & 17 deletions server/install.sh
View file
Open in desktop

This file was deleted.