From 2fbcb599e0149e3fb3c48202bee27ea078575a85 Mon Sep 17 00:00:00 2001
From: hackerman <3372410+aeneasr@users.noreply.github.com>
Date: Wed, 18 Sep 2019 23:45:44 +0200
Subject: [PATCH] docker: Add alpine image (#1566)

Closes #1558
---
 .goreleaser.yml               | 30 +++++++++++++++++++++---------
 Dockerfile-alpine             | 13 +++++++++++++
 oauth2/fosite_store_memory.go |  2 +-
 oauth2/fosite_store_sql.go    |  2 +-
 4 files changed, 36 insertions(+), 11 deletions(-)
 create mode 100644 Dockerfile-alpine

diff --git a/.goreleaser.yml b/.goreleaser.yml
index a529c656f36..9f4438966e4 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -49,14 +49,14 @@ snapshot:
   name_template: "{{ .Tag }}-next"
 changelog:
   sort: asc
-brew:
-  github:
-    owner: ory
-    name: homebrew-hydra
-  homepage:  https://www.ory.sh
-  commit_author:
-    name: ory
-    email: hi@ory.sh
+brews:
+  - github:
+      owner: ory
+      name: homebrew-hydra
+    homepage:  https://www.ory.sh
+    commit_author:
+      name: ory
+      email: hi@ory.sh
 
 scoop:
   bucket:
@@ -68,12 +68,24 @@ scoop:
     email: hi@ory.sh
 
 dockers:
-  - image_templates:
+  - dockerfile: Dockerfile
+    binaries:
+      - hydra
+    image_templates:
       - "oryd/hydra:v{{ .Major }}"
       - "oryd/hydra:v{{ .Major }}.{{ .Minor }}"
       - "oryd/hydra:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}"
       - "oryd/hydra:{{ .Env.DOCKER_SHORT_TAG }}"
       - "oryd/hydra:latest"
+  - dockerfile: Dockerfile-alpine
+    binaries:
+      - hydra
+    image_templates:
+      - "oryd/hydra:v{{ .Major }}-alpine"
+      - "oryd/hydra:v{{ .Major }}.{{ .Minor }}-alpine"
+      - "oryd/hydra:v{{ .Major }}.{{ .Minor }}.{{ .Patch }}-alpine"
+      - "oryd/hydra:{{ .Env.DOCKER_SHORT_TAG }}-alpine"
+      - "oryd/hydra:latest-alpine"
 
 release:
   prerelease: auto
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
new file mode 100644
index 00000000000..be5eedb86db
--- /dev/null
+++ b/Dockerfile-alpine
@@ -0,0 +1,13 @@
+# To compile this image manually run:
+#
+# $ GO111MODULE=on GOOS=linux GOARCH=amd64 go build && docker build -t oryd/hydra:v1.0.0-rc.7_oryOS.10 . && rm hydra
+FROM alpine:3.9
+
+RUN apk add -U --no-cache ca-certificates
+
+COPY hydra /usr/bin/hydra
+
+USER 1000
+
+ENTRYPOINT ["hydra"]
+CMD ["serve", "all"]
diff --git a/oauth2/fosite_store_memory.go b/oauth2/fosite_store_memory.go
index 705130596d0..127e64adbc2 100644
--- a/oauth2/fosite_store_memory.go
+++ b/oauth2/fosite_store_memory.go
@@ -99,7 +99,7 @@ func (s *FositeMemoryStore) GetClients(ctx context.Context, limit, offset int) (
 	}
 
 	clients := map[string]client.Client{}
-	for _, c := range interim  {
+	for _, c := range interim {
 		clients[c.GetID()] = c
 	}
 
diff --git a/oauth2/fosite_store_sql.go b/oauth2/fosite_store_sql.go
index 7b182e5d8a8..960cbd3de80 100644
--- a/oauth2/fosite_store_sql.go
+++ b/oauth2/fosite_store_sql.go
@@ -231,7 +231,7 @@ func (s *FositeSQLStore) GetClients(ctx context.Context, limit, offset int) (map
 	}
 
 	clients := map[string]client.Client{}
-	for _, c := range interim  {
+	for _, c := range interim {
 		clients[c.GetID()] = c
 	}