Skip to content

Code review changes #278

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
merged 8 commits into from
Feb 26, 2019
Merged

Code review changes #278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1b8c816
fix dockerfile reference to build explorer
parrobe Feb 5, 2019
f345ccf
Merge branch 'master' into master
parrobe Feb 7, 2019
84df0e8
Merge branch 'master' into master
parrobe Feb 7, 2019
17d3238
Merge branch 'master' into master
arthurbarr Feb 7, 2019
2dbee56
Merge pull request #272 from parrobe/master
parrobe Feb 12, 2019
f1f9152
Change for running as a non-root user (#276)
arthurbarr Feb 25, 2019
bb8a34f
Tidy up commented code
arthurbarr Feb 26, 2019
38180fb
Merge branch 'nonroot' into nonroot2
arthurbarr Feb 26, 2019
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-UBUNTU
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ build-advancedserver-cover: docker-version

.PHONY: build-explorer
build-explorer: downloads/$(MQ_ARCHIVE_DEV) docker-pull
$(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))
$(call docker-build-mq,mq-explorer:latest-$(ARCH),incubating/mq-explorer/Dockerfile,$(MQ_ARCHIVE_DEV),"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)",$(MQ_VERSION))

.PHONY: build-sdk
build-sdk: downloads/$(MQ_SDK_ARCHIVE) build-sdk-ex
Expand Down
11 changes: 0 additions & 11 deletions internal/containerruntime/runtime.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,6 @@ func GetSecurityAttributes() string {
return a
}

// func logUser() {
// u, err := user.GetUser()
// if err == nil {
// if len(u.SupplementalGID) == 0 {
// log.Printf("Running as user ID %v (%v) with primary group %v", u.UID, u.Name, u.PrimaryGID)
// } else {
// log.Printf("Running as user ID %v (%v) with primary group %v, and supplementary groups %v", u.UID, u.Name, u.PrimaryGID, strings.Join(u.SupplementalGID, ","))
// }
// }
// }

func readProc(filename string) (value string, err error) {
// #nosec G304
buf, err := ioutil.ReadFile(filename)
Expand Down
1 change: 0 additions & 1 deletion internal/containerruntime/runtime_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ func GetFilesystem(path string) (string, error) {
t, ok := fsTypes[int64(statfs.Type)]
if !ok {
return "unknown", nil
// log.Printf("WARNING: detected %v has unknown filesystem type %x", path, statfs.Type)
}
return t, nil
}
Expand Down
1 change: 0 additions & 1 deletion internal/user/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ func getCurrentUserGroups() ([]string, error) {

out = strings.TrimSpace(out)
if out == "" {
// we don't have any groups?
return nilArray, fmt.Errorf("Unable to determine groups for current user")
}

Expand Down
1 change: 0 additions & 1 deletion test/docker/docker_api_test_util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,6 @@ func runContainerWithPorts(t *testing.T, cli *client.Client, containerConfig *co
hostConfig := container.HostConfig{
Binds: []string{
coverageBind(t),
// terminationBind(t),
},
PortBindings: nat.PortMap{},
CapDrop: []string{
Expand Down