MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2024-12-24 22:25:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1139 from harshavardhana/docker

Browse Source 
docker: Make sure that we properly check for containers.
This commit is contained in:
Harshavardhana 2016-02-18 13:59:22 -08:00
commit 51e611a380
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -138,7 +138,7 @@ install: gomake-all
dockerimage: checkdocker verifiers $(UI_ASSETS)
@echo "Building docker image:" minio:$(TAG)
@GO15VENDOREXPERIMENT=1 go build --ldflags $(DOCKER_LDFLAGS) -o minio.dockerimage
@GO15VENDOREXPERIMENT=1 GOOS=linux GOARCH=amd64 go build --ldflags $(DOCKER_LDFLAGS) -o minio.dockerimage
@mkdir -p export
@sudo docker build --rm --tag=minio/minio:$(TAG) .
@rmdir export

4
runtime-checks.go
View File

@ -29,12 +29,12 @@ import (
// isContainerized returns true if we are inside a containerized environment.
func isContainerized() bool {
// Docker containers contain ".dockerinit" at its root path.
if _, e := os.Stat("/.dockerinit"); os.IsNotExist(e) {
if _, e := os.Stat("/.dockerinit"); e == nil {
return true
}
// Check if cgroup policies for init process contains docker string.
if cgroupData, e := ioutil.ReadFile("/proc/1/cgroup"); e != nil {
if cgroupData, e := ioutil.ReadFile("/proc/1/cgroup"); e == nil {
if strings.Contains(string(cgroupData), "/docker-") {
return true
}