Skip to content

fix(*): resolve build and container start issues #89

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
mboersma merged 4 commits into from
Apr 13, 2016
Merged

fix(*): resolve build and container start issues #89

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
fb9c82d
fix(Dockerfile): update location of "mc" binary
mboersma Apr 5, 2016
6d5af58
fix(server/install.sh): don't get "go vet" package
mboersma Apr 12, 2016
1c3097c
fix(Makefile): add "build" to "docker-build" target
mboersma Apr 12, 2016
8e5f5f4
fix(glide): revert to last-known-good version of deis/pkg/aboutme
mboersma Apr 12, 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: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ build:
test:
${DEV_ENV_CMD} go test ${TEST_PACKAGES}

docker-build: build-server
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}
Expand Down
2 changes: 1 addition & 1 deletion boot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const configdir = "/home/minio/.minio/"
const templv3 = `{
"version": "3",
"alias": {
"dl": "https://dl.minio.io:9000",
"dl": "https://dl.minio.io",
"localhost": "http://localhost:9000",
"play": "https://play.minio.io:9000",
"s3": "https://s3.amazonaws.com"
Expand Down
2 changes: 1 addition & 1 deletion glide.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion glide.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import:
- package: gopkg.in/yaml.v2
version: a83829b6f1293c91addabc89d0571c246397bbf4
- package: github.com/deis/pkg
version: v0.4.0
version: f63d9718b86f17c9320f838fb3eb6039cadb9691
subpackages:
- /aboutme
- /utils
Expand Down
4 changes: 2 additions & 2 deletions rootfs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ 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 curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.OFFICIAL.2015-09-05T23-43-46Z -o /usr/bin/mc
RUN chmod 755 /usr/bin/mc
COPY . /
USER minio
RUN mkdir /home/minio/.minio
CMD "boot"
CMD ["/bin/boot"]
2 changes: 2 additions & 0 deletions server/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,7 @@ cd $GOPATH/src/github.com/minio
git clone -b master --single-branch https://github.com/minio/minio.git minio
cd minio
git reset --hard 356b889
# HACK remove the "go vet" installation line
sed -i.bak '63 d' Makefile
make install
cp $GOPATH/bin/minio /pwd/minio