From 8eef58a0531ba4cdf982ed3dfd37641eaaf96c74 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 31 Aug 2022 10:52:08 -0400 Subject: [PATCH 01/15] fix: upgrade ruby to fix fpm dependency --- .github/workflows/main.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf669c5b3..3a490aa01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.3 + ruby-version: 2.6 - uses: actions/setup-python@v2 with: @@ -114,7 +114,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.3 + ruby-version: 2.6 - name: download packages uses: actions/download-artifact@v1 diff --git a/Makefile b/Makefile index 5a9963efa..4a98be19a 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,13 @@ endif fpm: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v fpm >/dev/null || gem install fpm --no-ri --no-rdoc + command -v fpm >/dev/null || gem install fpm --no-rdoc endif package_cloud: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v package_cloud >/dev/null || gem install package_cloud --no-ri --no-rdoc + command -v package_cloud >/dev/null || gem install package_cloud --no-rdoc endif bindata.go: From 411cb1414f7fefba387859bdc72c9bf9a9b0b216 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:00:09 -0400 Subject: [PATCH 02/15] fix: use updated flag for no-document --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a98be19a..0cf90b375 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,13 @@ endif fpm: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v fpm >/dev/null || gem install fpm --no-rdoc + command -v fpm >/dev/null || gem install fpm --no-document endif package_cloud: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v package_cloud >/dev/null || gem install package_cloud --no-rdoc + command -v package_cloud >/dev/null || gem install package_cloud --no-document endif bindata.go: From e740089215fa5f5ba50b92dc92fec2c9187b08d2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:30 -0400 Subject: [PATCH 03/15] Update python to version v218 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 8e1a11531..975955610 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v214 +v218 From 5ae32a700ae8a06554e3e6e94e9940f6ff6b2d18 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:32 -0400 Subject: [PATCH 04/15] Update go to version v168 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 27cfefe7d..03de02af8 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v166 +v168 From 18f68dd2b7f9bd8d4232500019fc8aa865144cc2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:32 -0400 Subject: [PATCH 05/15] Update php to version v224 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 9723eb6a0..cc08b9dfa 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v223 +v224 From 452933c821684673c72e1ca4f66f0f8fc95aa92d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:33 -0400 Subject: [PATCH 06/15] Update static to version v17 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 6f7f377bf..703a257b8 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v16 +v17 From ffdee2036a77bb9b00fd548e255f39cbec957f20 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 31 Aug 2022 10:49:08 -0400 Subject: [PATCH 07/15] feat: add support for building a herokuish:22 image --- .circleci/config.yml | 5 +++++ .github/workflows/release.yml | 8 ++++++++ Makefile | 3 +++ README.md | 2 +- contrib/post-install | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 320b7805d..830f75c24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,8 @@ jobs: docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest --build-arg STACK_VERSION=18 . - run: | docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 --build-arg STACK_VERSION=20 . + - run: | + docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 --build-arg STACK_VERSION=22 . - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 @@ -50,6 +52,9 @@ jobs: - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 + - run: | + docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 + docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 workflows: version: 2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c8a50719..190da45fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,9 @@ jobs: - name: Build herokuish-20 run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-20 -t gliderlabs/herokuish:latest-20 --build-arg STACK_VERSION=20 . + - name: Build herokuish-22 + run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 -t gliderlabs/herokuish:latest-22 --build-arg STACK_VERSION=22 . + - name: Push herokuish-18 run: | docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-18 @@ -46,3 +49,8 @@ jobs: run: | docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-20 docker image push gliderlabs/herokuish:latest-20 + + - name: Push herokuish-22 + run: | + docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 + docker image push gliderlabs/herokuish:latest-22 diff --git a/Makefile b/Makefile index 0cf90b375..931ae0576 100644 --- a/Makefile +++ b/Makefile @@ -56,10 +56,12 @@ build/docker: ifeq ($(CIRCLECI),true) docker build -t $(IMAGE_NAME):$(BUILD_TAG) . docker build -t $(IMAGE_NAME):$(BUILD_TAG)-20 --build-arg STACK_VERSION=20 . + docker build -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . else chmod +x build/linux/$(NAME) build/darwin/$(NAME) docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG) . docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG)-20 --build-arg STACK_VERSION=20 . + docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . endif build/deb: @@ -119,6 +121,7 @@ clean: deps: docker pull heroku/heroku:18-build docker pull heroku/heroku:20-build + docker pull heroku/heroku:22-build cd / && go get -u github.com/jteeuwen/go-bindata/... cd / && go get -u github.com/progrium/basht/... $(MAKE) bindata.go diff --git a/README.md b/README.md index 94c8fecbd..c1539846d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A command line tool for emulating Heroku build and runtime tasks in containers. Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc. -The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:18 and Heroku:20 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. +The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:18, Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. Herokuish is a community project and is in no way affiliated with Heroku. diff --git a/contrib/post-install b/contrib/post-install index 6547d66e4..732439ca0 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -21,5 +21,7 @@ VERSION=$(cat /var/lib/herokuish/VERSION) sudo docker pull "gliderlabs/herokuish:v${VERSION}-18" sudo docker pull "gliderlabs/herokuish:v${VERSION}-20" +sudo docker pull "gliderlabs/herokuish:v${VERSION}-22" sudo docker tag "gliderlabs/herokuish:v${VERSION}-18" gliderlabs/herokuish:latest sudo docker tag "gliderlabs/herokuish:v${VERSION}-20" gliderlabs/herokuish:latest-20 +sudo docker tag "gliderlabs/herokuish:v${VERSION}-22" gliderlabs/herokuish:latest-22 From d51a9720b5c427b9224ca0c0861acc2151c494ef Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 21:44:11 -0400 Subject: [PATCH 08/15] Update static to version v21 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 703a257b8..168943762 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v17 +v21 From acb7e8d717785ae5b7409b7a7209f38fbb696d77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:55:29 +0000 Subject: [PATCH 09/15] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.14.11 to 2.15.3. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/v2.15.3/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.14.11...v2.15.3) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index db0c83e27..3fe904cc8 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -579,16 +579,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -603,7 +603,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -641,7 +641,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -657,20 +657,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -685,7 +685,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -724,7 +724,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -740,7 +740,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php56", @@ -880,16 +880,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", "shasum": "" }, "require": { @@ -898,7 +898,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -936,7 +936,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" }, "funding": [ { @@ -952,7 +952,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/routing", @@ -1112,16 +1112,16 @@ }, { "name": "twig/twig", - "version": "v2.14.11", + "version": "v2.15.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", "shasum": "" }, "require": { @@ -1137,7 +1137,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.14-dev" + "dev-master": "2.15-dev" } }, "autoload": { @@ -1176,7 +1176,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + "source": "https://github.com/twigphp/Twig/tree/v2.15.3" }, "funding": [ { @@ -1188,7 +1188,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:57:25+00:00" + "time": "2022-09-28T08:40:08+00:00" } ], "packages-dev": [ @@ -1244,5 +1244,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From f936e9f5ee5c98b6e96a9678026dc2fe36929530 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:43 -0400 Subject: [PATCH 10/15] Update python to version v222 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 975955610..96ed0f2af 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v218 +v222 From 5c582dd300406cadc7049ca4557122160cc4db93 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:43 -0400 Subject: [PATCH 11/15] Update nodejs to version v201 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index bc579f822..1b4c45cc4 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v198 +v201 From 71a319bbe70ed81211150689e833a9f779cc1310 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:44 -0400 Subject: [PATCH 12/15] Update scala to version v96 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index 4401de6eb..ae2994c2d 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v94 +v96 From b629f99a1f1e15c7ed2d3afa77e641c5ea5bc545 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:45 -0400 Subject: [PATCH 13/15] Update static to version v22 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 168943762..53d1c14db 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v21 +v22 From 431178cb56fb361985ce8d1bfa09a3fbdaf0c139 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:45 -0400 Subject: [PATCH 14/15] Update php to version v226 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index cc08b9dfa..3e1126dc8 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v224 +v226 From c715c6b923b7f0d4f549c23ef51082a8d779f7a1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 21:32:02 -0400 Subject: [PATCH 15/15] Release 0.5.38 - @josegonzalez Add support for building a herokuish:22 image #792 - @josegonzalez Upgrade ruby version used in CI #793 - @josegonzalez Update go to version v168 #795 - @josegonzalez Update nodejs to version v201 #804 - @josegonzalez Update php to version v226 #803 - @josegonzalez Update python to version v222 #802 - @josegonzalez Update scala to version v96 #801 - @josegonzalez Update static to version v22 #800 - @josegonzalez chore(deps): bump twig/twig from 2.14.11 to 2.15.3 in /buildpacks/buildpack-php/tests/php #799 --- CHANGELOG.md | 12 ++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a531c432..0d0e58809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.38](https://github.com/gliderlabs/herokuish/compare/v0.5.37...v0.5.38) - 2021-11-01 + +- @josegonzalez Add support for building a herokuish:22 image #792 +- @josegonzalez Upgrade ruby version used in CI #793 +- @josegonzalez Update go to version v168 #795 +- @josegonzalez Update nodejs to version v201 #804 +- @josegonzalez Update php to version v226 #803 +- @josegonzalez Update python to version v222 #802 +- @josegonzalez Update scala to version v96 #801 +- @josegonzalez Update static to version v22 #800 +- @josegonzalez chore(deps): bump twig/twig from 2.14.11 to 2.15.3 in /buildpacks/buildpack-php/tests/php #799 + ## [0.5.37](https://github.com/gliderlabs/herokuish/compare/v0.5.36...v0.5.37) - 2021-08-07 ### Changed diff --git a/Dockerfile b/Dockerfile index 4af99674e..f42232ced 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,7 +17,7 @@ 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.37/herokuish_0.5.37_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.38/herokuish_0.5.38_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index 931ae0576..2bc8c1e1d 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.5.37 +VERSION ?= 0.5.38 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index c1539846d..5f34cbe70 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.5.37-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.38-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.5.37/herokuish_0.5.37_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.38/herokuish_0.5.38_linux_x86_64.tgz \ | tar -xzC /bin ```