diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d08c83e..7fb28cf41 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.32](https://github.com/gliderlabs/herokuish/compare/v0.5.31...v0.5.32) - 2021-11-06 + +### Changed + +- @josegonzalez Update php to version v200 #717 +- @josegonzalez Update python to version v202 #721 +- @josegonzalez Update ruby to version v231 #718 +- @josegonzalez Update static buildpack to v15 #720 +- @josegonzalez Update the release name and body after creation #722 + ## [0.5.31](https://github.com/gliderlabs/herokuish/compare/v0.5.30...v0.5.31) - 2021-10-22 ### Added diff --git a/Dockerfile b/Dockerfile index 7194ab70c..d66cf071a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,17 +7,17 @@ ENV DEBIAN_FRONTEND noninteractive LABEL com.gliderlabs.herokuish/stack=$STACK RUN apt-get update -qq \ - && apt-get install -qq -y daemontools \ - && cp /etc/ImageMagick-6/policy.xml /etc/ImageMagick-6/policy.xml.custom \ - && apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew \ + && apt-get install -qq -y daemontools \ + && cp /etc/ImageMagick-6/policy.xml /etc/ImageMagick-6/policy.xml.custom \ + && apt-get -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew \ --allow-downgrades \ --allow-remove-essential \ --allow-change-held-packages \ dist-upgrade \ - && 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.31/herokuish_0.5.31_linux_x86_64.tgz" \ + && 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.32/herokuish_0.5.32_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ @@ -25,14 +25,14 @@ RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /exec \ && cd /tmp/buildpacks \ && rm -rf \ - */.git \ - */.github \ - */.circleci \ - */changelogs \ - */spec \ - */support/build \ - */builds \ - */test \ - */tmp + */.git \ + */.github \ + */.circleci \ + */changelogs \ + */spec \ + */support/build \ + */builds \ + */test \ + */tmp COPY include/default_user.bash /tmp/default_user.bash RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash diff --git a/Makefile b/Makefile index ef6d913c6..aa991290b 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ NAME = 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.31 +VERSION ?= 0.5.32 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish @@ -128,6 +128,11 @@ bin/gh-release: tar xf bin/gh-release.tgz -C bin chmod +x bin/gh-release +bin/gh-release-body: + mkdir -p bin + curl -o bin/gh-release-body "https://raw.githubusercontent.com/dokku/gh-release-body/master/gh-release-body" + chmod +x bin/gh-release-body + test: basht tests/*/tests.sh @@ -150,7 +155,7 @@ lint: @echo linting... shellcheck -e SC2002,SC2030,SC2031,SC2034 -s bash include/*.bash tests/**/tests.sh -release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_amd64.deb bin/gh-release +release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_amd64.deb bin/gh-release bin/gh-release-body chmod +x build/linux/$(NAME) build/darwin/$(NAME) rm -rf release && mkdir release cp build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm release/$(NAME)-$(VERSION)-1.x86_64.rpm @@ -159,6 +164,7 @@ release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_ tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME) bin/gh-release create gliderlabs/$(NAME) $(VERSION) \ $(shell git rev-parse --abbrev-ref HEAD) v$(VERSION) + bin/gh-release-body $(MAINTAINER)/$(REPOSITORY) v$(VERSION) release-packagecloud: package_cloud @$(MAKE) release-packagecloud-deb diff --git a/README.md b/README.md index 7d50386b3..4eb7c3716 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.31-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.32-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.31/herokuish_0.5.31_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.32/herokuish_0.5.32_linux_x86_64.tgz \ | tar -xzC /bin ``` diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index afaa608f8..3894671e6 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v199 +v200 diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 1b4c45cc4..2076b6e9d 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v201 +v202 diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index c2800375c..df001f256 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v230 +v231 diff --git a/buildpacks/buildpack-static/buildpack-url b/buildpacks/buildpack-static/buildpack-url index 97a76575e..0e90fae76 100644 --- a/buildpacks/buildpack-static/buildpack-url +++ b/buildpacks/buildpack-static/buildpack-url @@ -1 +1 @@ -https://github.com/dokku/buildpack-nginx +https://github.com/dokku/heroku-buildpack-nginx diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 958b5a36e..75701b229 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v14 +v15