Merge branch 'release/0.5.0'

takama · Oct 24, 2017 · c9e746e · c9e746e
2 parents 98d488e + e68bef1
commit c9e746e
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -8,7 +8,7 @@ REGISTRY?=docker.io/takama
 CA_DIR?=certs
 
 # Use the 0.0.0 tag for testing, it shouldn't clobber any release builds
-RELEASE?=0.4.6
+RELEASE?=0.5.0
 GOOS?=linux
 GOARCH?=amd64
 
@@ -53,7 +53,7 @@ build: vendor test certs
 certs:
 ifeq ("$(wildcard $(CA_DIR)/ca-certificates.crt)","")
 	@echo "+ $@"
-	@docker run --name ${CONTAINER_NAME}-certs -d alpine:edge sh -c "apk --update upgrade && apk add ca-certificates && update-ca-certificates"
+	@docker run --name ${CONTAINER_NAME}-certs -d alpine:latest sh -c "apk --update upgrade && apk add ca-certificates && update-ca-certificates"
 	@docker wait ${CONTAINER_NAME}-certs
 	@mkdir -p ${CA_DIR}
 	@docker cp ${CONTAINER_NAME}-certs:/etc/ssl/certs/ca-certificates.crt ${CA_DIR}

diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -1,6 +1,6 @@
 name: k8sapp
 description: A Helm charts for Kubernetes application
-version: 0.4.6
+version: 0.5.0
 home: https://my.domain/
 sources:
   - https://github.com/takama/k8sapp

diff --git a/charts/values-dev.yaml b/charts/values-dev.yaml
@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.6
+  tag: 0.5.0
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

diff --git a/charts/values-stable.yaml b/charts/values-stable.yaml
@@ -36,7 +36,7 @@ image:
   ##
   registry: docker.io/takama
   name: k8sapp
-  tag: 0.4.6
+  tag: 0.5.0
 
   ## Docker Registry/Hub auth secret name, always use `registry-pull-secret` if registry inside if k8s
   ##

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,7 +1,13 @@
-# Version 0.4.6
+# Version 0.5.0
 
 [Documentation](README.md)
 
+## Changelog since 0.4.6
+
+### Configuration
+
+- Fixed #40 alpine image for installing certificates ([#41](https://github.com/takama/k8sapp/pull/41), [@takama](https://github.com/takama))
+- Released version without embedded router
 
 ## Changelog since 0.4.5