github/weave-scope
1
0
Fork 0
mirror of https://github.com/weaveworks/scope.git synced 2026-03-03 18:20:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3311 from weaveworks/undo-tools-changes

Browse Source 
Undo changes made in the 'tools' subtree
This commit is contained in:
Bryan Boreham
2018-08-10 13:30:56 +01:00
committed by GitHub
parent 5531a29d5a cfc460270a
commit edf5fa3c82
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/socks/Dockerfile
View File

@@ -1,5 +1,5 @@
FROM gliderlabs/alpine
LABEL maintainer="Weaveworks Inc <help@weave.works>"
MAINTAINER Weaveworks Inc <help@weave.works>
WORKDIR /
COPY proxy /
EXPOSE 8000

2
tools/socks/main.go
View File

@@ -8,10 +8,10 @@ import (
"strings"
"text/template"
"context"
socks5 "github.com/armon/go-socks5"
"github.com/weaveworks/common/mflag"
"github.com/weaveworks/common/mflagext"
"golang.org/x/net/context"
)
type pacFileParameters struct {