Merge pull request #1184 from gliderlabs/master

Release 0.9.1
gliderlabs · Apr 1, 2024 · a688574 · a688574
2 parents 9a49a5c + 9823d06
commit a688574
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.9.1](https://github.com/gliderlabs/herokuish/compare/v0.9.0...v0.9.1) - 2024-04-01
+
+- #1181 @josegonzalez: fix: do not unnecessarily create/change files when starting a process
+- #1182 @josegonzalez: fix: invert disable-chown check
+- #1183 @josegonzalez: fix: create the profile.d directory during the build process
+
 ## [0.9.0](https://github.com/gliderlabs/herokuish/compare/v0.8.0...v0.9.0) - 2024-03-31
 
 - #1177 @dependabot: Update php to version v248

diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ REPOSITORY = herokuish
 DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
 HARDWARE = $(shell uname -m)
 SYSTEM_NAME  = $(shell uname -s | tr '[:upper:]' '[:lower:]')
-VERSION ?= 0.9.0
+VERSION ?= 0.9.1
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://github.com/gliderlabs/herokuish/workflows/CI/badge.svg)](https://github.com/gliderlabs/herokuish/actions?query=workflow%3ACI)
 [![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.9.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
+[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.9.1-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:
 
 ```shell
-RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.0/herokuish_0.9.0_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.1/herokuish_0.9.1_linux_x86_64.tgz \
     | tar -xzC /bin
 ```
 

diff --git a/include/buildpack.bash b/include/buildpack.bash
@@ -204,6 +204,7 @@ buildpack-execute() {
   fi
   if [[ -f "$build_path/.release" ]]; then
     config_vars="$(cat "$build_path/.release" | yaml-get config_vars)"
+    unprivileged mkdir -p "$build_path/.profile.d"
     unprivileged touch "$build_path/.profile.d/00_config_vars.sh"
     if [[ "$config_vars" ]]; then
       mkdir -p "$build_path/.profile.d"

diff --git a/include/procfile.bash b/include/procfile.bash
@@ -102,13 +102,16 @@ procfile-load-profile() {
     # shellcheck disable=SC1090
     source "$file"
   done
-  mkdir -p "$app_path/.profile.d"
-  # shellcheck disable=SC2154
-  chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d"
-  for file in "$app_path/.profile.d"/*.sh; do
-    # shellcheck disable=SC1090
-    source "$file"
-  done
+  if [[ -d "$app_path/.profile.d" ]]; then
+    # shellcheck disable=SC2154
+    if [[ "$HEROKUISH_DISABLE_CHOWN" != "true" ]]; then
+      chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d"
+    fi
+    for file in "$app_path/.profile.d"/*.sh; do
+      # shellcheck disable=SC1090
+      source "$file"
+    done
+  fi
   if [[ -s "$app_path/.profile" ]]; then
     # shellcheck disable=SC1090
     source "$app_path/.profile"
@@ -122,8 +125,8 @@ procfile-setup-home() {
   # shellcheck disable=SC2154
   usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1
   # shellcheck disable=SC2154
-  chown "$unprivileged_user:$unprivileged_group" "$app_path"
-  if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then
+  if [[ "$HEROKUISH_DISABLE_CHOWN" != "true" ]]; then
+    chown "$unprivileged_user:$unprivileged_group" "$app_path"
     # unprivileged_user & unprivileged_group are defined in outer scope
     # shellcheck disable=SC2154
     find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group"