Skip to content

fix(mc/Dockerfile): make the mc image use alpine:3.3 #48

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

Merged
arschles merged 4 commits into from
Jan 15, 2016
Merged

fix(mc/Dockerfile): make the mc image use alpine:3.3 #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
882f940
fix(mc/Dockerfile,rootfs/Dockerfile): switch to alpine:3.3
Jan 14, 2016
d25fafa
fix(Dockerfile): revert to make minio still run in ubuntu
Jan 15, 2016
2c9a822
fix(Makefile): build mc with CGO off
Jan 15, 2016
70611f5
fix(mc/Makefile): build mc without cgo
Jan 15, 2016
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
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions mc/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion mc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
8 changes: 2 additions & 6 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"