Merge pull request #669 from gliderlabs/master

Release v0.5.27
gliderlabs · Mar 26, 2021 · 8ec32c4 · 8ec32c4
2 parents 284879e + 0db4ffb
commit 8ec32c4
Show file tree

Hide file tree

Showing 14 changed files with 63 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,19 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.5.27](https://github.com/gliderlabs/herokuish/compare/v0.5.26...v0.5.27) - 2021-03-25
+
+### Changed
+- @dependabot Bump jinja2 from 2.10.1 to 2.11.3 in /buildpacks/buildpack-multi/tests/multi #661
+- @dependabot Bump jinja2 from 2.10.1 to 2.11.3 in /buildpacks/buildpack-python/tests/python-flask #660
+- @josegonzalez Drop non-buildpack related files #662
+- @dependabot Update ruby to version v225 #667
+- @dependabot Update scala to version v90 #666
+- @dependabot Update php to version v190 #665
+- @dependabot Update go to version v153 #664
+- @dependabot Ensure there is parity between the primary and dev images #668
+- @dependabot Prepare permissions quicker for slower filesystems #663
+
 ## [0.5.26](https://github.com/gliderlabs/herokuish/compare/v0.5.25...v0.5.26) - 2021-02-25
 
 ### Changed

diff --git a/Dockerfile b/Dockerfile
@@ -17,11 +17,22 @@ RUN apt-get update -qq \
  && mv /etc/ImageMagick-6/policy.xml.custom /etc/ImageMagick-6/policy.xml \
  && apt-get clean \
  && rm -rf /var/cache/apt/archives/* /var/lib/apt/lists/* /var/tmp/*
-RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.26/herokuish_0.5.26_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.27/herokuish_0.5.27_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
+    && ln -s /bin/herokuish /exec \
+    && cd /tmp/buildpacks \
+    && rm -rf \
+            */.git \
+            */.github \
+            */.circleci \
+            */changelogs \
+            */spec \
+            */support/build \
+            */builds \
+            */test \
+            */tmp
 COPY include/default_user.bash /tmp/default_user.bash
 RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -22,6 +22,17 @@ COPY ./build/linux/herokuish /bin/herokuish
 RUN /bin/herokuish buildpack install \
     && ln -s /bin/herokuish /build \
     && ln -s /bin/herokuish /start \
-    && ln -s /bin/herokuish /exec
+    && ln -s /bin/herokuish /exec \
+    && cd /tmp/buildpacks \
+    && rm -rf \
+            */.git \
+            */.github \
+            */.circleci \
+            */changelogs \
+            */spec \
+            */support/build \
+            */builds \
+            */test \
+            */tmp
 COPY include/default_user.bash /tmp/default_user.bash
 RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash
diff --git a/Makefile b/Makefile
@@ -1,7 +1,7 @@
 NAME = herokuish
 DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HARDWARE = $(shell uname -m)
-VERSION ?= 0.5.26
+VERSION ?= 0.5.27
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Circle CI](https://circleci.com/gh/gliderlabs/herokuish.png?style=shield)](https://circleci.com/gh/gliderlabs/herokuish)
 [![IRC Channel](https://img.shields.io/badge/irc-%23gliderlabs-blue.svg)](https://kiwiirc.com/client/irc.freenode.net/#gliderlabs)
-[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.26-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
+[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.27-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
 
 A command line tool for emulating Heroku build and runtime tasks in containers.
 
@@ -19,7 +19,7 @@ Download and uncompress the latest binary tarball from [releases](https://github
 For example, you can do this directly in your Dockerfiles installing into `/bin` as one step:
 
 ```
-RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.26/herokuish_0.5.26_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.27/herokuish_0.5.27_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version
@@ -1 +1 @@
-v152
+v153
diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.0
-Jinja2==2.10.1
+Jinja2==2.11.3
 gunicorn==19.5.0
diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version
@@ -1 +1 @@
-v189
+v190
diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt
@@ -1,3 +1,3 @@
 Flask==1.0
-Jinja2==2.10.1
+Jinja2==2.11.3
 gunicorn==19.5.0
diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version
@@ -1 +1 @@
-v224
+v225
diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version
@@ -1 +1 @@
-v89
+v90
diff --git a/go.mod b/go.mod
@@ -5,6 +5,6 @@ go 1.12
 require (
 	github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
-	github.com/progrium/go-basher v0.0.0-20170201215011-ad5de635edd1
+	github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1
 	gopkg.in/yaml.v2 v2.2.2
 )
diff --git a/go.sum b/go.sum
@@ -2,8 +2,8 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia
 github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
-github.com/progrium/go-basher v0.0.0-20170201215011-ad5de635edd1 h1:BC5AL7yOCJKQ1bGiBoJwdyHHBGSLQIdbU+l/E11j0HA=
-github.com/progrium/go-basher v0.0.0-20170201215011-ad5de635edd1/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI=
+github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 h1:pNf4kIAZbE5uKZ1tZAEXOvDcO7+32PeMOlAl85E8UU4=
+github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/include/buildpack.bash b/include/buildpack.bash
@@ -130,6 +130,8 @@ buildpack-install() {
 		chown -R root:root "$target_path"
 		chmod 755 "$target_path"
 	fi
+
+	find "$buildpack_path" \( \! -user "${unprivileged_user:-32767}" -o \! -group "${unprivileged_group:-32767}" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "${unprivileged_user:-32767}:${unprivileged_group:-32767}"
 }
 
 buildpack-list() {
@@ -155,14 +157,19 @@ buildpack-setup() {
 	# unprivileged_user defined in outer scope
 	# shellcheck disable=SC2154
 	usermod --home "$HOME" "$unprivileged_user" > /dev/null 2>&1
+
+	# Prepare permissions quicker for slower filesystems
 	# vars defined in outer scope
 	# shellcheck disable=SC2154
-	chown -R "$unprivileged_user:$unprivileged_group" \
-		"$app_path" \
-		"$build_path" \
-		"$cache_path" \
-		"$env_path" \
-		"$buildpack_path"
+	chown -R "$unprivileged_user:$unprivileged_group" "$app_path"
+	# shellcheck disable=SC2154
+	find "$build_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group"
+	# shellcheck disable=SC2154
+	find "$cache_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group"
+	# shellcheck disable=SC2154
+	find "$env_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group"
+	# shellcheck disable=SC2154
+	find "$buildpack_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group"
 
 	# Useful settings / features
 	export CURL_CONNECT_TIMEOUT="30"