Merge pull request #171 from gliderlabs/master

release 0.3.16

Author: michaelshobbs

CHANGELOG.md

@@ -11,6 +11,11 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 
+## [0.3.16] - 2016-07-14
+### Added
+- @michaelshobbs add named unprivileged user
+
+
 ## [0.3.15] - 2016-07-14
 ### Fixed
 - @joshmanders only delete $app_path if $import_path is not empty. fixes #111
@@ -237,7 +242,8 @@ All notable changes to this project will be documented in this file.
 - User for `buildpack-build` is `$USER` or randomized
 - User for `procfile-exec` is `$USER` or detected from `/app`
 
-[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.15...HEAD
+[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.3.16...HEAD
+[0.3.16]: https://github.com/gliderlabs/herokuish/compare/v0.3.15...v0.3.16
 [0.3.15]: https://github.com/gliderlabs/herokuish/compare/v0.3.14...v0.3.15
 [0.3.14]: https://github.com/gliderlabs/herokuish/compare/v0.3.13...v0.3.14
 [0.3.13]: https://github.com/gliderlabs/herokuish/compare/v0.3.12...v0.3.13

Dockerfile

@@ -1,7 +1,9 @@
 FROM heroku/cedar:14
-RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.15/herokuish_0.3.15_linux_x86_64.tgz \
+RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.16/herokuish_0.3.16_linux_x86_64.tgz \
 		--silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \
 	&& ln -s /bin/herokuish /start \
 	&& ln -s /bin/herokuish /exec
+COPY include/default_user.bash /tmp/default_user.bash
+RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash

Dockerfile.dev

@@ -9,3 +9,5 @@ RUN /bin/herokuish buildpack install \
 	&& ln -s /bin/herokuish /build \
 	&& ln -s /bin/herokuish /start \
 	&& ln -s /bin/herokuish /exec
+COPY include/default_user.bash /tmp/default_user.bash
+RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash

Makefile

@@ -1,6 +1,6 @@
 NAME = herokuish
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.3.15
+VERSION ?= 0.3.16
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 

include/default_user.bash

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+addgroup --quiet --gid "32767" "herokuishgroup" && \
+adduser \
+    --shell /bin/bash \
+    --disabled-password \
+    --force-badname \
+    --no-create-home \
+    --uid "32767" \
+    --gid "32767" \
+    --gecos '' \
+    --quiet \
+    --home "/app" \
+    "herokuishuser"

tests/functional/tests.sh

@@ -25,3 +25,10 @@ T_slug-generate() {
 		herokuish slug generate
 		tar tzf /tmp/slug.tgz"
 }
+
+T_default-user() {
+	_test-user() {
+		id herokuishuser
+	}
+	herokuish-test "test-user" "$(fn-source _test-user)"
+}