Skip to content

Commit

Permalink
- Glide updated glide to use newer versions of packages.
Browse files Browse the repository at this point in the history
- Dockerfile updated to use glide to download/manage dependencies.
- Updated README to point to official docker image.
  • Loading branch information
abutaha committed Jan 14, 2018
1 parent 08a4cf6 commit 01e8be4
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 8 deletions.
16 changes: 12 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
FROM golang:1.8
FROM golang:1.9-alpine

ENV PORT_NUM 9200
WORKDIR /go/src/app
WORKDIR /go/src/github.com/abutaha/aws-es-proxy
COPY . .

RUN go-wrapper download
RUN go-wrapper install
#RUN go-wrapper download
#RUN go-wrapper install

RUN apk add --update bash curl git && \
rm /var/cache/apk/*

RUN mkdir -p $$GOPATH/bin && \
curl https://glide.sh/get | sh

RUN glide install
RUN go build -o aws-es-proxy

EXPOSE ${PORT_NUM}
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,14 +115,14 @@ Usage of ./aws-es-proxy:

## Docker

There is a docker image avaiable for aws-es-proxy. There is an image on docker hub called `gorillastack/aws-es-proxy`. To run the image:
There is an official docker image avaiable for aws-es-proxy. To run the image:

```sh
# Prints usage info (-h)
docker run --rm -it gorillastack/aws-es-proxy
docker run --rm -it abutaha/aws-es-proxy

# Runs with custom command/args
docker run --rm -it gorillastack/aws-es-proxy ./aws-es-proxy -endpoint https://dummy-host.ap-southeast-2.es.amazonaws.com
docker run --rm -it abutaha/aws-es-proxy ./aws-es-proxy -endpoint https://dummy-host.ap-southeast-2.es.amazonaws.com
```

To expose a port number other than the default 9200, pass an environment variable of `PORT_NUM` to docker with the port number you wish to expose for your service.
Expand Down
5 changes: 4 additions & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ owners:
email: [email protected]
import:
- package: github.com/aws/aws-sdk-go
version: ^1.4.22
version: ~v1.12.61
subpackages:
- aws/credentials
- aws/session
- aws/signer/v4
- package: github.com/satori/go.uuid
version: 36e9d2ebbde5e3f13ab2e25625fd453271d6522e

0 comments on commit 01e8be4

Please sign in to comment.