diff --git a/.gitignore b/.gitignore index 9bfcada..78888ec 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ # Docker Compose file docker-compose.yml docker-compose.override.yml + +# vendor +vendor diff --git a/Dockerfile b/Dockerfile index 3ec24c7..6305a63 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,9 @@ -FROM golang:1.7-alpine +FROM golang:1.9-alpine RUN apk add --no-cache git +RUN apk add --no-cache git curl \ + && curl https://glide.sh/get | sh \ + && apk del curl RUN mkdir -p /go/src/elyby/minecraft-skinsystem \ /go/src/elyby/minecraft-skinsystem/data/capes \ @@ -8,14 +11,18 @@ RUN mkdir -p /go/src/elyby/minecraft-skinsystem \ WORKDIR /go/src/app +COPY ./glide.* /go/src/app/ + +RUN glide install + COPY ./minecraft-skinsystem.go /go/src/app/ COPY ./lib /go/src/app/lib -RUN go-wrapper download -RUN go-wrapper install +RUN go build minecraft-skinsystem.go \ + && mv minecraft-skinsystem /usr/local/bin/ EXPOSE 80 VOLUME ["/go/src/app"] -CMD ["go-wrapper", "run"] +CMD ["minecraft-skinsystem"] diff --git a/glide.lock b/glide.lock new file mode 100644 index 0000000..d0a97c7 --- /dev/null +++ b/glide.lock @@ -0,0 +1,26 @@ +hash: f6f5dc2f8d1d8077909c7d1f20d235db58ea482023084274c2ad8a5d8fefcbe1 +updated: 2017-06-26T13:29:35.448302526+03:00 +imports: +- name: github.com/gorilla/context + version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 +- name: github.com/gorilla/mux + version: bcd8bc72b08df0f70df986b97f95590779502d31 +- name: github.com/mediocregopher/radix.v2 + version: dbcfd490034f823788edc555737247e9ba628b6c + subpackages: + - pool + - redis +- name: github.com/mono83/slf + version: 8188a95c8d6b74c43953abb38b8bd6fdbc412ff5 + subpackages: + - params + - rays + - recievers + - recievers/ansi + - recievers/statsd + - wd +- name: github.com/mono83/udpwriter + version: a064bd7e3acfda563ea680b913b9ef24b7a73e15 +- name: github.com/streadway/amqp + version: 27859d32540aebd2e5befa52dc59ae8e6a0132b6 +testImports: [] diff --git a/glide.yaml b/glide.yaml new file mode 100644 index 0000000..615d7ed --- /dev/null +++ b/glide.yaml @@ -0,0 +1,17 @@ +package: elyby/minecraft-skinsystem +ignore: +- elyby/minecraft-skinsystem +import: +- package: github.com/gorilla/mux + version: ^1.4.0 +- package: github.com/mediocregopher/radix.v2 + subpackages: + - pool + - redis +- package: github.com/mono83/slf + subpackages: + - rays + - recievers/ansi + - recievers/statsd + - wd +- package: github.com/streadway/amqp