From 042bccb2e66596ba766d05b6cda694faa30c19db Mon Sep 17 00:00:00 2001 From: Travis Reeder Date: Tue, 11 Oct 2016 18:18:06 -0700 Subject: [PATCH] Fixes issues with dependencies. --- Makefile | 1 + README.md | 4 +- glide.lock | 120 ++++++++++++++++++++++++++--------------------------- glide.yaml | 40 ++---------------- 4 files changed, 66 insertions(+), 99 deletions(-) diff --git a/Makefile b/Makefile index ff21635b2..a379dd7ec 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ # Just builds dep: @ glide install + rm -rf vendor/github.com/heroku/docker-registry-client/vendor build: @ go build -o functions diff --git a/README.md b/README.md index e6ce3f96d..5625eafa6 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,9 @@ ## Run functions -```docker run --rm --name functions --privileged -it -v $PWD/data:/app/data -p 8080:8080 iron/functions``` +```sh +docker run --rm --name functions --privileged -it -v $PWD/data:/app/data -p 8080:8080 iron/functions +``` *Note: A list of configurations via env variables can be found [here](docs/api.md).* diff --git a/glide.lock b/glide.lock index 003bc82de..da2944a07 100644 --- a/glide.lock +++ b/glide.lock @@ -1,73 +1,69 @@ -hash: 82cf96066912cb9972777d8ec8a85e83cba60d9d0563186eb604b086f078550a -updated: 2016-10-07T09:59:48.422329386-03:00 +hash: 5ebe9893c89f9d0b31b71bd27fb37bf4fae1662e6fbc429d566b0d75ca7ffcfc +updated: 2016-10-11T18:10:30.697966926-07:00 imports: - name: github.com/amir/raidman version: c74861fe6a7bb8ede0a010ce4485bdbb4fc4c985 subpackages: - proto - name: github.com/asaskevich/govalidator - version: 7b3beb6df3c42abd3509abfc3bcacc0fbfb7c877 + version: 593d64559f7600f29581a3ee42177f5dbded27a9 - name: github.com/boltdb/bolt - version: f4c032d907f61f08dba2d719c58f108a1abb8e81 + version: dfb21201d9270c1082d5fb0f07f500311ff72f18 - name: github.com/cactus/go-statsd-client version: 91c326c3f7bd20f0226d3d1c289dd9f8ce28d33d subpackages: - statsd - name: github.com/dgrijalva/jwt-go - version: 24c63f56522a87ec5339cc3567883f1039378fdb + version: 268038b363c7a8d7306b8e35bf77a1fde4b0c402 - name: github.com/docker/distribution - version: c8d8e7e357a1e5cf39aec1cfd4b3aef82414b3fc + version: 252cc27ab1272108bfd74cf939d354db77862d93 subpackages: - - manifest/schema1 - context - digest - manifest + - manifest/schema1 - reference - uuid - name: github.com/docker/docker - version: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d + version: 9bd8c1d3321d1b264e84ff5fba4dc04730c264f3 subpackages: + - api/types/filters + - api/types/mount + - api/types/swarm + - api/types/versions - opts - pkg/archive - pkg/fileutils - pkg/homedir - - pkg/stdcopy - - api/types/filters - pkg/idtools - pkg/ioutils + - pkg/longpath - pkg/pools - pkg/promise + - pkg/stdcopy - pkg/system - - pkg/longpath - - api/types/versions - - pkg/units -- name: github.com/docker/engine-api - version: 4290f40c056686fcaa5c9caf02eac1dde9315adf - subpackages: - - types/swarm - - types/mount - name: github.com/docker/go-units version: f2145db703495b2e525c59662db69a7344b00bb8 - name: github.com/docker/libtrust version: fa567046d9b14f6aa788882a950d69651d230b21 - name: github.com/fsnotify/fsnotify - version: 944cff21b3baf3ced9a880365682152ba577d348 + version: f12c6236fe7b5cf6bcf30e5935d08cb079d78334 - name: github.com/fsouza/go-dockerclient - version: 4efaf0ea3c8990e1648f68672d011289f0c0cb0a + version: 4bae70ae976745ea1cd0db139b53f83a7bcb898d - name: github.com/garyburd/redigo - version: ffa8d46ada782d81cfda81a0fbd9f45ceae448e8 + version: 4ed1111375cbeb698249ffe48dd463e9b0a63a7a subpackages: - - redis - internal + - redis - name: github.com/gin-gonic/gin - version: f931d1ea80ae95a6fc739213cdd9399bd2967fb6 + version: 4a6bc4aac4607e253bcda67c8c5bcda693d2388e subpackages: - binding - render - name: github.com/go-openapi/analysis version: b44dc874b601d9e4e2f6e19140e794ba24bead3b - name: github.com/go-openapi/errors - version: 4178436c9f2430cdd945c50301cfb61563b56573 + version: b6a74a9df33099a5a952e7d1dbfe93dfa6b7a076 - name: github.com/go-openapi/jsonpointer version: 46af16f9f7b149af66e5d1bd010e3574dc06de98 - name: github.com/go-openapi/jsonreference @@ -75,15 +71,15 @@ imports: - name: github.com/go-openapi/loads version: 18441dfa706d924a39a030ee2c3b1d8d81917b38 - name: github.com/go-openapi/runtime - version: f6c2edcf343b34428165fe02674524a1977cad9e + version: 499b9bceffc59518b28ff84e0717692883137578 - name: github.com/go-openapi/spec - version: 451818a42c4560481c33bf592ca7665c928f7889 + version: 6aced65f8501fe1217321abf0749d354824ba2ff - name: github.com/go-openapi/strfmt - version: d65c7fdb29eca313476e529628176fe17e58c488 + version: f827e8cf30538b3983710c9fb4dd76ea04e3c8e0 - name: github.com/go-openapi/swag - version: c98c5a1cc708d9860aeeceea6391da6f223d479c + version: 0e04f5e499b19bf51031c01a00f098f25067d8dc - name: github.com/go-openapi/validate - version: 03d947b0268e1c2bb5c74ac4095447f140c9a112 + version: e6da236c48ce621803fc5d3883d8739aad0ce318 - name: github.com/golang/protobuf version: 2402d76f3d41f928c7902a765dfc872356dd3aad subpackages: @@ -97,61 +93,63 @@ imports: - name: github.com/hashicorp/go-cleanhttp version: ad28ea4487f05916463e2423a55166280e8254b5 - name: github.com/hashicorp/hcl - version: ef8133da8cda503718a74741312bf50821e6de79 + version: baeb59c710717b06aac1dbe2270e8192ec593244 subpackages: - hcl/ast - hcl/parser - - hcl/token - - json/parser - hcl/scanner - hcl/strconv + - hcl/token + - json/parser - json/scanner - json/token - name: github.com/heroku/docker-registry-client - version: e6568fe3de1cb83f1fe3107e7637c8be829ef149 + version: 2a2e6b9e3eed0a98d438f111ba7469744c07281d subpackages: - registry - name: github.com/iron-io/runner - version: 165c16a9bec62628dc8a8f17e4cbdc6f30707366 - repo: git@github.com:iron-io/runner.git + version: 88ccb49510e12309d9f9fcf95e4b2cbaead1ed94 + repo: https://github.com/iron-io/runner.git vcs: git subpackages: - common + - common/stats - drivers - drivers/docker - drivers/mock - - common/stats - name: github.com/kr/fs version: 2788f0dbd16903de03cb8186e5c7d97b69ad387b - name: github.com/lib/pq - version: 50761b0867bd1d9d069276790bcd4a3bccf2324a + version: 3cd0097429be7d611bb644ef85b42bfb102ceea4 subpackages: - oid - name: github.com/magiconair/properties - version: 0723e352fa358f9322c938cc2dadda874e9151a9 + version: 61b492c03cf472e0c6419be5899b8e0dc28b1b88 - name: github.com/mailru/easyjson - version: 2ea6ed0ea8d20091ff80b30ab47e206e776e7c53 + version: 34560e358dc05e2c28f6fda2f5c9e7494a4b9b19 subpackages: + - buffer - jlexer - jwriter - - buffer - name: github.com/manucorporat/sse version: ee05b128a739a0fb76c7ebd3ae4810c1de808d6d +- name: github.com/Microsoft/go-winio + version: ce2922f643c8fd76b46cadc7f404a06282678b34 - name: github.com/mitchellh/mapstructure - version: a6ef2f080c66d0a2e94e97cf74f80f772855da63 + version: ca63d7c062ee3c9f34db231e352b60012b4fd0c1 - name: github.com/opencontainers/runc - version: b1eb19b4f3c731dcc2c709e8864483292d051f7f + version: 8d505cb9dc8d665c59a7f1491bf0e2a6bd5a5319 subpackages: - libcontainer/system - libcontainer/user - name: github.com/pelletier/go-buffruneio version: df1e16fde7fc330a0ca68167c23bf7ed6ac31d6d - name: github.com/pelletier/go-toml - version: 45932ad32dfdd20826f5671da37a5f3ce9f26a8d + version: 5a62685873ef617233ab5f1b825a6e4a758e16cf - name: github.com/pkg/errors - version: 839d9e913e063e28dfd0e6c7b7512793e0a48be9 + version: 17b591df37844cde689f4d5813e5cea0927d8dd2 - name: github.com/pkg/sftp - version: 4d0e916071f68db74f8a73926335f809396d6b42 + version: a71e8f580e3b622ebff585309160b1cc549ef4d2 - name: github.com/PuerkitoBio/purell version: 8a290539e2e8629dbc4e6bad948158f790ec31f4 - name: github.com/PuerkitoBio/urlesc @@ -159,22 +157,22 @@ imports: - name: github.com/satori/go.uuid version: 879c5887cd475cd7864858769793b2ceb0d44feb - name: github.com/Sirupsen/logrus - version: 3ec0642a7fb6488f65b06f9040adc67e3990296a + version: 4b6ea7319e214d98c938f12692336f7ca9348d6b subpackages: - hooks/syslog - name: github.com/spf13/afero - version: 52e4a6cfac46163658bd4f123c49b6ee7dc75f78 + version: 20500e2abd0d1f4564a499e83d11d6c73cd58c27 subpackages: - mem - sftp - name: github.com/spf13/cast - version: 2580bc98dc0e62908119e4737030cc2fdfc45e4c + version: e31f36ffc91a2ba9ddb72a4b6a607ff9b3d3cb63 - name: github.com/spf13/jwalterweatherman version: 33c24e77fb80341fe7130ee7c594256ff08ccc46 - name: github.com/spf13/pflag - version: b83537d79690b75cac5e021b036ae16792bf0f20 + version: 103ce5cd2042f2fe629c1957abb64ab3e7f50235 - name: github.com/spf13/viper - version: 670c42a85b2a2215949acd943cb8f11add317e3f + version: 7fb2782df3d83e0036cc89f461ed0422628776f4 - name: golang.org/x/crypto version: c10c31b5e94b6f7a0283272dc2bb27163dcea24b subpackages: @@ -186,35 +184,35 @@ imports: subpackages: - context - context/ctxhttp - - proxy - idna + - proxy - name: golang.org/x/sys - version: 8d1157a435470616f975ff9bb013bea8d0962067 + version: 9eef40adf05b951699605195b829612bd7b69952 subpackages: - unix + - windows - name: golang.org/x/text - version: ede1cb9f9f2f84c3bace9ca113fd740fc916cdd0 + version: d69c40b4be55797923cec7457fac7a244d91a9b6 subpackages: - - transform - - unicode/norm - - secure/precis - cases + - internal/tag - language - runes - secure/bidirule - - width - - internal - - internal/tag + - secure/precis + - transform - unicode/bidi + - unicode/norm + - width - name: gopkg.in/go-playground/validator.v8 version: c193cecd124b5cc722d7ee5538e945bdb3348435 - name: gopkg.in/mgo.v2 version: 3f83fa5005286a7fe593b055f0d7771a7dce4655 subpackages: - bson + - internal/json - internal/sasl - internal/scram - - internal/json - name: gopkg.in/yaml.v2 - version: a5b47d31c556af34a302ce5d659e6fea44d90de0 + version: e4d366fc3c7938e2958e662b4258c7a89e1f0e3e testImports: [] diff --git a/glide.yaml b/glide.yaml index 8a5fa6f57..08a142d2b 100644 --- a/glide.yaml +++ b/glide.yaml @@ -13,9 +13,9 @@ import: - package: github.com/go-openapi/validate - package: github.com/google/btree - package: github.com/iron-io/runner - repo: git@github.com:iron-io/runner.git + repo: https://github.com/iron-io/runner.git vcs: git - version: master + version: glide-up subpackages: - common - drivers @@ -37,38 +37,4 @@ import: - package: github.com/cactus/go-statsd-client version: ^3.1.0 subpackages: - - statsd -- name: github.com/docker/docker - version: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d - subpackages: - - opts - - pkg/archive - - pkg/fileutils - - pkg/homedir - - pkg/stdcopy - - api/types/filters - - pkg/idtools - - pkg/ioutils - - pkg/pools - - pkg/promise - - pkg/system - - pkg/longpath - - api/types/versions - - pkg/units -- name: github.com/docker/docker - version: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d - subpackages: - - opts - - pkg/archive - - pkg/fileutils - - pkg/homedir - - pkg/stdcopy - - api/types/filters - - pkg/idtools - - pkg/ioutils - - pkg/pools - - pkg/promise - - pkg/system - - pkg/longpath - - api/types/versions - - pkg/units \ No newline at end of file + - statsd \ No newline at end of file