bump go version

pottava · Nov 28, 2019 · b75ccb4 · b75ccb4
1 parent d903718
commit b75ccb4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -5,7 +5,16 @@ all: build
 deps:
 	@docker run --rm -it -v "${GOPATH}"/src/github.com:/go/src/github.com \
 			-w /go/src/github.com/pottava/aws-s3-proxy \
-			supinf/go-dep:0.5 ensure
+			golang:1.13.4-alpine3.10 sh -c 'apk --no-cache add git && go mod vendor'
+
+up:
+	@docker-compose up -d
+
+logs:
+	@docker-compose logs -f
+
+down:
+	@docker-compose down -v
 
 test:
 	@docker run --rm -it -v "${GOPATH}"/src/github.com:/go/src/github.com \

diff --git a/circle.yml b/circle.yml
@@ -3,7 +3,7 @@ jobs:
   test:
     working_directory: /go/src/github.com/pottava/aws-s3-proxy
     docker:
-      - image: circleci/golang:1.13.3
+      - image: circleci/golang:1.13.4
     steps:
       - checkout
       - run: go mod download
@@ -18,7 +18,7 @@ jobs:
   build:
     working_directory: /go/src/github.com/pottava/aws-s3-proxy
     docker:
-      - image: circleci/golang:1.13.3
+      - image: circleci/golang:1.13.4
     steps:
       - checkout
       - run: go mod download

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.1"
 
 services:
   app:
-    image: golang:1.13.3-alpine3.10
+    image: golang:1.13.4-alpine3.10
     command: go run main.go
     ports:
       - 8080:80

diff --git a/docker/linux/2.0/Dockerfile b/docker/linux/2.0/Dockerfile
@@ -1,7 +1,7 @@
 # AWS S3 Proxy v2.0
 # docker run -d -p 8080:80 -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY -e AWS_S3_BUCKET pottava/s3-proxy
 
-FROM golang:1.13.3-alpine3.10 AS builder
+FROM golang:1.13.4-alpine3.10 AS builder
 RUN apk --no-cache add gcc musl-dev git
 RUN go get -u github.com/pottava/aws-s3-proxy
 WORKDIR /go/src/github.com/pottava/aws-s3-proxy