From e359c0b030247e1790ea133f619f98d9a5cf6af0 Mon Sep 17 00:00:00 2001
From: James Hillyerd <james@hillyerd.com>
Date: Sat, 17 Aug 2019 12:43:58 -0700
Subject: [PATCH] docker: go 1.11 -> 1.12, alpine linux 3.8 -> 3.10

---
 CHANGELOG.md | 4 ++++
 Dockerfile   | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d369ab..7587e78 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Changed
 - Updated JavaScript dependencies.
 - Updated Go dependencies.
+- Updated Docker build: Go to 1.12, and Alpine Linux to 3.10
+
+### Fixed
+- URLs to view/download attachments from REST API, #138
 
 
 ## [v3.0.0-beta1]
diff --git a/Dockerfile b/Dockerfile
index 025212e..0f1703f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # Docker build file for Inbucket: https://www.inbucket.org/
 
 # Build
-FROM golang:1.11-alpine3.8 as builder
+FROM golang:1.12-alpine3.10 as builder
 RUN apk add --no-cache --virtual .build-deps git make npm
 WORKDIR /build
 COPY . .
@@ -16,7 +16,7 @@ RUN npm i
 RUN npm run build
 
 # Run in minimal image
-FROM alpine:3.8
+FROM alpine:3.10
 WORKDIR /opt/inbucket
 RUN mkdir bin defaults ui
 COPY --from=builder /build/inbucket bin