Merge pull request #765 from gliderlabs/master

Release 0.5.35
gliderlabs · May 6, 2022 · bbb1ac3 · bbb1ac3
2 parents b9c5c81 + a87d8a7
commit bbb1ac3
Show file tree

Hide file tree

Showing 19 changed files with 438 additions and 116 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.12.0
+          go-version: 1.17.8
 
       - uses: ruby/setup-ruby@v1
         with:
@@ -86,7 +86,7 @@ jobs:
 
       - uses: actions/setup-go@v2
         with:
-          go-version: 1.12.0
+          go-version: 1.17.8
 
       - name: download packages
         uses: actions/download-artifact@v1

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -31,7 +31,7 @@ jobs:
         run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
 
       - name: Build herokuish-18
-        run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-18 -t gliderlabs/herokuish:latest-18 --build-arg STACK_VERSION=18 .
+        run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-18 -t gliderlabs/herokuish:latest-18 -t gliderlabs/herokuish:latest --build-arg STACK_VERSION=18 .
 
       - 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 .
@@ -40,6 +40,7 @@ jobs:
         run: |
           docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-18
           docker image push gliderlabs/herokuish:latest-18
+          docker image push gliderlabs/herokuish:latest
 
       - name: Push herokuish-20
         run: |

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,28 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [0.5.35](https://github.com/gliderlabs/herokuish/compare/v0.5.34...v0.5.35) - 2021-05-06
+
+### Changed
+
+- @dependabot chore(deps): bump gopkg.in/yaml.v2 from 2.2.2 to 2.2.8 #741
+- @dependabot chore(deps): bump django from 2.2.24 to 2.2.27 in /buildpacks/buildpack-python/tests/python-django #743
+- @dependabot chore(deps): bump twig/twig from 2.3.0 to 2.14.11 in /buildpacks/buildpack-php/tests/php #744
+- @dependabot chore(deps): bump symfony/http-kernel from 3.2.7 to 3.4.49 in /buildpacks/buildpack-php/tests/php #751
+- @dependabot chore(deps): bump django from 2.2.27 to 2.2.28 in /buildpacks/buildpack-python/tests/python-django #763
+- @josegonzalez feat: upgrade to golang 1.17.8 #759
+- @josegonzalez Update go to version v161 #752
+- @josegonzalez Update nodejs to version v195 #762
+- @josegonzalez Update php to version v216 #760
+- @josegonzalez Update python to version v210 #761
+- @josegonzalez Update ruby to version v240 #758
+- @josegonzalez Update scala to version v92 #749
+
+### Fixed
+
+- @gjrdiesel Add gliderlabs/herokuish:latest tagging #740
+- @josegonzalez Pin to a version of markupsafe that works with older jinja2 #750
+
 ## [0.5.34](https://github.com/gliderlabs/herokuish/compare/v0.5.33...v0.5.34) - 2021-01-19
 
 ### 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.34/herokuish_0.5.34_linux_x86_64.tgz" \
+RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.35/herokuish_0.5.35_linux_x86_64.tgz" \
     --silent -L | tar -xzC /bin
 RUN /bin/herokuish buildpack install \
     && ln -s /bin/herokuish /build \

diff --git a/Dockerfile.build b/Dockerfile.build
@@ -1,4 +1,4 @@
-FROM golang:1.12.0
+FROM golang:1.17.8
 
 ENV DEBIAN_FRONTEND noninteractive
 

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

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

diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version
@@ -1 +1 @@
-v160
+v161
diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt
@@ -1,3 +1,4 @@
-Flask==1.0
+Flask==1.1.4
 Jinja2==2.11.3
 gunicorn==19.5.0
+markupsafe==2.0.1
diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version
@@ -1 +1 @@
-v189
+v195
diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version
@@ -1 +1 @@
-v205
+v216