diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14ee036fd..f60747b8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.3 - uses: actions/setup-python@v5 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b0e5b96..0a1efef20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,31 @@ All notable changes to this project will be documented in this file. +## [0.7.4](https://github.com/gliderlabs/herokuish/compare/v0.7.3...v0.7.4) - 2024-04-4 + +- #1120 @dependabot: chore(deps): bump rack from 3.0.8 to 3.0.9 in /buildpacks/buildpack-multi/tests/multi +- #1121 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-python/tests/python-flask +- #1122 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-python/tests/python-flask +- #1123 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-multi/tests/multi +- #1124 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-multi/tests/multi +- #1125 @dokku-bot: Update nodejs to version v236 +- #1126 @dependabot: chore(deps): bump golang from 1.21 to 1.22 +- #1127 @dokku-bot: Update python to version v243 +- #1128 @dokku-bot: Update scala to version v97 +- #1130 @dokku-bot: Update go to version v187 +- #1131 @dokku-bot: Update php to version v246 +- #1133 @dependabot: chore(deps-dev): bump test-unit from 3.6.1 to 3.6.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1136 @dependabot: chore(deps): bump rack from 3.0.9 to 3.0.9.1 in /buildpacks/buildpack-multi/tests/multi +- #1137 @dependabot: chore(deps): bump rack from 2.2.8 to 2.2.8.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1138 @josegonzalez: Upgrade to ruby 3.3 in CI +- #1139 @dokku-bot: Update ruby to version v266 +- #1140 @dokku-bot: Update nodejs to version v237 +- #1141 @dokku-bot: Update scala to version v98 +- #1142 @josegonzalez: Add ability for users to disable the chown process on container start +- #1143 @dokku-bot: Update ruby to version v267 +- #1144 @dokku-bot: Update go to version v188 +- #1145 @dokku-bot: Update php to version v247 + ## [0.7.3](https://github.com/gliderlabs/herokuish/compare/v0.7.2...v0.7.3) - 2024-01-29 - #1060 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi diff --git a/Dockerfile b/Dockerfile index f07005127..a2647c365 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=20 -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder RUN mkdir /src ADD . /src/ WORKDIR /src diff --git a/Makefile b/Makefile index 2239f9b53..f83370dbf 100644 --- 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.7.3 +VERSION ?= 0.7.4 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index c978d5252..b9ceb7bb1 100644 --- 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.7.3-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.4-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.7.3/herokuish_0.7.3_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.4/herokuish_0.7.4_linux_x86_64.tgz \ | tar -xzC /bin ``` diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 3ecae9401..930f7dd17 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v184 +v188 diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 7b6f5f7b7..90e061b53 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.8) + rack (3.0.9.1) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index d221a5ce9..efa92fe93 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.1 +Flask==3.0.2 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.4 +markupsafe==2.1.5 diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a2f544cdf..529193d15 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v235 +v237 diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 1e48f7666..d0a08b740 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v244 +v247 diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 8ba02379b..6b1dadddb 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v242 +v243 diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index d221a5ce9..efa92fe93 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.1 +Flask==3.0.2 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.4 +markupsafe==2.1.5 diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index f0d48c716..cc71c451b 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v265 +v267 diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 6fd662768..e8cfe5121 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (2.2.8) + rack (2.2.8.1) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) @@ -21,7 +21,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - test-unit (3.6.1) + test-unit (3.6.2) power_assert tilt (2.3.0) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index ae2994c2d..509525dfc 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v96 +v98 diff --git a/include/procfile.bash b/include/procfile.bash index f6454c1b9..431a77389 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -118,8 +118,10 @@ procfile-load-profile() { procfile-setup-home() { export HOME="$app_path" - usermod --home "$app_path" "$unprivileged_user" > /dev/null 2>&1 - # 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" + usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 + if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then + # 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" + fi }