Skip to content

Add CurrentContainerID into Docker struct #158

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.

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
merged 9 commits into from
Feb 24, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 9 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -272,14 +272,15 @@ type SwarmNode struct {

// Accessible from the root in templates as .Docker
type Docker struct {
Name string
NumContainers int
NumImages int
Version string
ApiVersion string
GoVersion string
OperatingSystem string
Architecture string
Name string
NumContainers int
NumImages int
Version string
ApiVersion string
GoVersion string
OperatingSystem string
Architecture string
CurrentContainerID string
}

// Host environment variables accessible from root in templates as .Env
Expand Down
65 changes: 49 additions & 16 deletions context.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
package dockergen

import (
"bufio"
"os"
"regexp"
"sync"

"github.com/fsouza/go-dockerclient"
Expand Down Expand Up @@ -29,14 +31,15 @@ func SetServerInfo(d *docker.Env) {
mu.Lock()
defer mu.Unlock()
dockerInfo = Docker{
Name: d.Get("Name"),
NumContainers: d.GetInt("Containers"),
NumImages: d.GetInt("Images"),
Version: dockerEnv.Get("Version"),
ApiVersion: dockerEnv.Get("ApiVersion"),
GoVersion: dockerEnv.Get("GoVersion"),
OperatingSystem: dockerEnv.Get("Os"),
Architecture: dockerEnv.Get("Arch"),
Name: d.Get("Name"),
NumContainers: d.GetInt("Containers"),
NumImages: d.GetInt("Images"),
Version: dockerEnv.Get("Version"),
ApiVersion: dockerEnv.Get("ApiVersion"),
GoVersion: dockerEnv.Get("GoVersion"),
OperatingSystem: dockerEnv.Get("Os"),
Architecture: dockerEnv.Get("Arch"),
CurrentContainerID: GetCurrentContainerID(),
}
}

Expand Down Expand Up @@ -139,12 +142,42 @@ type Mount struct {
}

type Docker struct {
Name string
NumContainers int
NumImages int
Version string
ApiVersion string
GoVersion string
OperatingSystem string
Architecture string
Name string
NumContainers int
NumImages int
Version string
ApiVersion string
GoVersion string
OperatingSystem string
Architecture string
CurrentContainerID string
}

func GetCurrentContainerID() string {
file, err := os.Open("/proc/self/cgroup")

if err != nil {
return ""
}

reader := bufio.NewReader(file)
scanner := bufio.NewScanner(reader)
scanner.Split(bufio.ScanLines)

regex := "/docker/([[:alnum:]]{64})$"
re := regexp.MustCompilePOSIX(regex)

for scanner.Scan() {
_, lines, err := bufio.ScanLines([]byte(scanner.Text()), true)
if err == nil {
if re.MatchString(string(lines)) {
submatches := re.FindStringSubmatch(string(lines))
containerID := submatches[1]

return containerID
}
}
}

return ""
}
13 changes: 13 additions & 0 deletions context_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package dockergen

import (
"testing"
)

func TestGetCurrentContainerID(t *testing.T) {
currentContainerID := GetCurrentContainerID()

if len(currentContainerID) != 0 && len(currentContainerID) != 64 {
t.Fail()
}
}