From 5af589270401ce0377c9d4ad7334d784f6c2f722 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 5 Aug 2021 20:46:14 -0400 Subject: [PATCH 1/3] Update php to version v196 --- 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 bd80f5c1e..284af8797 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v195 +v196 From 84414907586f6f5fb1619547e3d0fc8fc9149470 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 5 Aug 2021 20:54:10 -0400 Subject: [PATCH 2/3] feat: pull latest-20 image in herokuish package Also avoid pruning the freshly pulled images --- contrib/post-install | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/post-install b/contrib/post-install index 3aad93998..d01f9d151 100644 --- a/contrib/post-install +++ b/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 From bd3211657125cd66fe297c42a61feaf288f9d25e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 5 Aug 2021 21:29:23 -0400 Subject: [PATCH 3/3] Release v0.5.30 ### Added - @josegonzalez Pull latest-20 image in herokuish package #694 ### Changed - @josegonzalez Update php to version v196 #693 --- CHANGELOG.md | 10 ++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 66c162c74..dc3fd405a 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Dockerfile b/Dockerfile index 337eaef20..24eca40a1 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.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 \ diff --git a/Makefile b/Makefile index 0194c355c..1b096f394 100644 --- a/Makefile +++ b/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 diff --git a/README.md b/README.md index 4fd7c827f..eb57181cc 100644 --- a/README.md +++ b/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 ```