Merge pull request #805 from gliderlabs/master

Release 0.5.38
gliderlabs · Nov 2, 2022 · a9622a7 · a9622a7
2 parents 3bac099 + c715c6b
commit a9622a7
Show file tree

Hide file tree

Showing 15 changed files with 74 additions and 44 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,13 +43,18 @@ 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
           docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest
       - 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/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/.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/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
@@ -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
@@ -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
@@ -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-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-ri --no-rdoc
+	command -v package_cloud >/dev/null || gem install package_cloud --no-document
 endif
 
 bindata.go:
@@ -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
@@ -2,13 +2,13 @@
 
 [![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.
 
 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.
 
@@ -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
 ```
 

diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version
@@ -1 +1 @@
-v166
+v168
diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version
@@ -1 +1 @@
-v198
+v201
diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version
@@ -1 +1 @@
-v223
+v226
diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock
diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version
@@ -1 +1 @@
-v214
+v222
diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version
@@ -1 +1 @@
-v94
+v96
diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version
@@ -1 +1 @@
-v16
+v22
diff --git 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