github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(api): fix default group for endpoint declared via -H

pull/1892/merge
Anthony Lapenna 2018-05-14 21:40:50 +02:00
parent 87fdd43afc
commit be236f9d09
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/cmd/portainer/main.go
View File

@ -256,9 +256,10 @@ func main() {
} }
if len(endpoints) == 0 { if len(endpoints) == 0 {
endpoint := &portainer.Endpoint{ endpoint := &portainer.Endpoint{
Name: "primary", Name: "primary",
URL: *flags.Endpoint, URL: *flags.Endpoint,
Type: portainer.DockerEnvironment, GroupID: portainer.EndpointGroupID(1),
Type: portainer.DockerEnvironment,
TLSConfig: portainer.TLSConfiguration{ TLSConfig: portainer.TLSConfiguration{
TLS: *flags.TLSVerify, TLS: *flags.TLSVerify,
TLSSkipVerify: *flags.TLSSkipVerify, TLSSkipVerify: *flags.TLSSkipVerify,

2
gruntfile.js
View File

@ -269,7 +269,7 @@ function shell_buildBinary(p, a) {
function shell_run(arch) { function shell_run(arch) {
return [ return [
'docker rm -f portainer', 'docker rm -f portainer',
'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-' + arch + ' --no-analytics' 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-' + arch + ' --no-analytics -H unix:///var/run/docker.sock'
].join(';'); ].join(';');
} }