Rooba
/
perkeep
mirror of https://github.com/perkeep/perkeep.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc/docker: restore check that we run in docker 

Fixes #744

Change-Id: Ide28a48c229c71a4305a507bb5a6671910d6a1ab
This commit is contained in:
mpl 2016-11-09 18:34:15 +01:00
parent 002eb40bfb
commit 5f699042cf
3 changed files with 84 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
misc/docker/release/build-binaries.go
View File

@ -22,6 +22,7 @@ package main // import "camlistore.org/misc/docker/release"
import (
"archive/tar"
"bufio"
"compress/gzip"
"flag"
"fmt"
@ -174,11 +175,36 @@ func checkArgs() {
}
}
func inDocker() bool {
r, err := os.Open("/proc/self/cgroup")
if err != nil {
log.Fatalf(`can't open "/proc/self/cgroup": %v`, err)
}
defer r.Close()
sc := bufio.NewScanner(r)
for sc.Scan() {
l := sc.Text()
fields := strings.SplitN(l, ":", 3)
if len(fields) != 3 {
log.Fatal(`unexpected line in "/proc/self/cgroup"`)
}
if !strings.HasPrefix(fields[2], "/docker/") {
return false
}
}
if err := sc.Err(); err != nil {
log.Fatal(err)
}
return true
}
func main() {
flag.Usage = usage
flag.Parse()
// TODO(mpl): find another way to detect whether we're on docker, as
// /.dockerinit does not exist anymore apparently? No time for now.
if !inDocker() {
fmt.Fprintf(os.Stderr, "Usage error: this program should be run within a docker container, and is meant to be called from misc/docker/dock.go\n")
usage()
}
checkArgs()
getCamliSrc()

30
misc/docker/release/zip-source.go
View File

@ -23,6 +23,7 @@ package main
import (
"archive/tar"
"archive/zip"
"bufio"
"compress/gzip"
"flag"
"fmt"
@ -321,11 +322,36 @@ func checkArgs() {
}
}
func inDocker() bool {
r, err := os.Open("/proc/self/cgroup")
if err != nil {
log.Fatalf(`can't open "/proc/self/cgroup": %v`, err)
}
defer r.Close()
sc := bufio.NewScanner(r)
for sc.Scan() {
l := sc.Text()
fields := strings.SplitN(l, ":", 3)
if len(fields) != 3 {
log.Fatal(`unexpected line in "/proc/self/cgroup"`)
}
if !strings.HasPrefix(fields[2], "/docker/") {
return false
}
}
if err := sc.Err(); err != nil {
log.Fatal(err)
}
return true
}
func main() {
flag.Usage = usage
flag.Parse()
// TODO(mpl): find another way to detect whether we're on docker, as
// /.dockerinit does not exist anymore apparently? No time for now.
if !inDocker() {
fmt.Fprintf(os.Stderr, "Usage error: this program should be run within a docker container, and is meant to be called from misc/docker/dock.go\n")
usage()
}
checkArgs()
getCamliSrc()

30
misc/docker/server/build-camlistore-server.go
View File

@ -23,6 +23,7 @@ package main // import "camlistore.org/misc/docker/server"
import (
"archive/tar"
"bufio"
"compress/gzip"
"flag"
"fmt"
@ -184,11 +185,36 @@ func checkArgs() {
}
}
func inDocker() bool {
r, err := os.Open("/proc/self/cgroup")
if err != nil {
log.Fatalf(`can't open "/proc/self/cgroup": %v`, err)
}
defer r.Close()
sc := bufio.NewScanner(r)
for sc.Scan() {
l := sc.Text()
fields := strings.SplitN(l, ":", 3)
if len(fields) != 3 {
log.Fatal(`unexpected line in "/proc/self/cgroup"`)
}
if !strings.HasPrefix(fields[2], "/docker/") {
return false
}
}
if err := sc.Err(); err != nil {
log.Fatal(err)
}
return true
}
func main() {
flag.Usage = usage
flag.Parse()
// TODO(mpl): find another way to detect whether we're on docker, as
// /.dockerinit does not exist anymore apparently? No time for now.
if !inDocker() {
fmt.Fprintf(os.Stderr, "Usage error: this program should be run within a docker container, and is meant to be called from misc/docker/dock.go\n")
usage()
}
checkArgs()
getCamliSrc()