Merge pull request #695 from gliderlabs/master

Release v0.5.30

CHANGELOG.md

@@ -1,6 +1,16 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.5.30](https://github.com/gliderlabs/herokuish/compare/v0.5.29...v0.5.30) - 2021-08-05
+
+### Added
+
+- @josegonzalez Pull latest-20 image in herokuish package #694
+
+### Changed
+
+- @josegonzalez Update php to version v196 #693
+
 ## [0.5.29](https://github.com/gliderlabs/herokuish/compare/v0.5.28...v0.5.29) - 2021-07-12
 
 ### Added

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.29/herokuish_0.5.29_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.30/herokuish_0.5.30_linux_x86_64.tgz" \
     --silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
     && ln -s /bin/herokuish /build \

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.29
+VERSION ?= 0.5.30
 IMAGE_NAME ?= $(NAME)
 BUILD_TAG ?= dev
 PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish

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.29-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
+[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.30-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.29/herokuish_0.5.29_linux_x86_64.tgz \
+RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.30/herokuish_0.5.30_linux_x86_64.tgz \
 		  | tar -xzC /bin
 ```
 

buildpacks/buildpack-php/buildpack-version

@@ -1 +1 @@
-v195
+v196

contrib/post-install

@@ -6,6 +6,12 @@ if which systemctl > /dev/null; then
   sleep 5
 fi
 
+echo "Pruning dangling images"
+docker images -f dangling=true | awk '{print $3}' | xargs docker rmi || true
+
+echo "Pruning unused gliderlabs/herokuish images"
+docker images -a | grep "^gliderlabs\/herokuish" | grep -v latest | awk '{print $3}' | xargs docker rmi || true
+
 echo 'Importing herokuish into docker (around 5 minutes)'
 if [[ -n "$http_proxy" ]] || [[ -n "$https_proxy" ]]; then
   echo "See the docker pull docs for proxy configuration";
@@ -14,10 +20,6 @@ fi
 VERSION=$(cat /var/lib/herokuish/VERSION)
 
 sudo docker pull "gliderlabs/herokuish:v${VERSION}"
+sudo docker pull "gliderlabs/herokuish:v${VERSION}-20"
 sudo docker tag "gliderlabs/herokuish:v${VERSION}" gliderlabs/herokuish:latest
-
-echo "Pruning dangling images"
-docker images -f dangling=true | awk '{print $3}' | xargs docker rmi || true
-
-echo "Pruning unused gliderlabs/herokuish images"
-docker images -a | grep "^gliderlabs\/herokuish" | grep -v latest | awk '{print $3}' | xargs docker rmi || true
+sudo docker tag "gliderlabs/herokuish:v${VERSION}-20" gliderlabs/herokuish:latest-20