Update the dockerfile and format main.go

pottava · Jan 30, 2017 · 0c4cd39 · 0c4cd39
1 parent b09dc18
commit 0c4cd39
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/dev/docker-compose-gox.yml b/dev/docker-compose-gox.yml
@@ -1,6 +1,4 @@
-# export BUILD_VERSION=v0.1.0
-# export BUILD_DATE=2016-02-15T12:00:00+0900
-# docker-compose -f dev/docker-compose-gox.yml run --rm build
+# BUILD_VERSION=v0.1.0 BUILD_DATE=`date +%FT%T%z` docker-compose -f development/docker-compose-gox.yml run --rm build
 
 build:
   image: pottava/gox:go1.8

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -22,5 +22,4 @@ services:
       - SSL_CERT_PATH
       - SSL_KEY_PATH
       - ACCESS_LOG=true
-      - GO15VENDOREXPERIMENT=1
     container_name: app
diff --git a/main.go b/main.go
@@ -221,10 +221,10 @@ func awss3(w http.ResponseWriter, r *http.Request) {
 }
 
 func s3get(backet, key string) (*s3.GetObjectOutput, error) {
-    sess, err := session.NewSession(&aws.Config{Region: aws.String(c.awsRegion)})
-    if err != nil {
-        log.Printf("[service] unable to create aws session: %s", err)
-    }
+	sess, err := session.NewSession(&aws.Config{Region: aws.String(c.awsRegion)})
+	if err != nil {
+		log.Printf("[service] unable to create aws session: %s", err)
+	}
 	req := &s3.GetObjectInput{
 		Bucket: aws.String(backet),
 		Key:    aws.String(key),

diff --git a/prod/Dockerfile b/prod/Dockerfile
@@ -29,12 +29,12 @@ RUN apk --no-cache add --virtual build-dependencies bash gcc musl-dev openssl go
 
     # Compile s3-proxy
     && go get -u github.com/pottava/aws-s3-proxy \
-    && mv /go/bin/aws-s3-proxy /aws-s3-proxy \
+    && mv /go/bin/aws-s3-proxy /usr/bin \
 
     # Clean up
     && apk del --purge build-dependencies \
     && rm -rf /usr/local/go /usr/lib/go /go /golang.tar.gz /*.patch
 
 EXPOSE 80
 
-CMD ["/aws-s3-proxy"]
+CMD ["aws-s3-proxy"]