Skip to content

Commit

Permalink
Merge pull request #739 from gjrdiesel/release-v0534
Browse files Browse the repository at this point in the history
  • Loading branch information
josegonzalez authored Jan 25, 2022
2 parents a28e0b3 + 9a12032 commit b9c5c81
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 11 deletions.
15 changes: 15 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
# Change Log
All notable changes to this project will be documented in this file.

## [0.5.34](https://github.com/gliderlabs/herokuish/compare/v0.5.33...v0.5.34) - 2021-01-19

### Changed

- @josegonzalez Update static to version v16 #738
- @josegonzalez Update go to version v160 #737
- @josegonzalez Update gradle to version v36 #736
- @josegonzalez Update python to version v205 #735
- @josegonzalez Update ruby to version v236 #734
- @gjrdiesel Update php to version v205 #733

### Fixed

- @IlyaSemenov Don't require binary in ci mode make (for circleci) #726

## [0.5.33](https://github.com/gliderlabs/herokuish/compare/v0.5.32...v0.5.33) - 2021-12-01

### Changed
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.33/herokuish_0.5.33_linux_x86_64.tgz" \
RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.34/herokuish_0.5.34_linux_x86_64.tgz" \
--silent -L | tar -xzC /bin
RUN /bin/herokuish buildpack install \
&& ln -s /bin/herokuish /build \
Expand Down
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
NAME = herokuish
MAINTAINER = gliderlabs
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.33
VERSION ?= 0.5.34
IMAGE_NAME ?= $(NAME)
BUILD_TAG ?= dev
PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
Expand Down Expand Up @@ -51,11 +53,11 @@ build: bindata.go
$(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb

build/docker:
chmod +x build/linux/$(NAME) build/darwin/$(NAME)
ifeq ($(CIRCLECI),true)
docker build -t $(IMAGE_NAME):$(BUILD_TAG) .
docker build -t $(IMAGE_NAME):$(BUILD_TAG)-20 --build-arg STACK_VERSION=20 .
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 .
endif
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.33-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.34-blue)](https://hub.docker.com/r/gliderlabs/herokuish)

A command line tool for emulating Heroku build and runtime tasks in containers.

Expand All @@ -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.33/herokuish_0.5.33_linux_x86_64.tgz \
RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.34/herokuish_0.5.34_linux_x86_64.tgz \
| tar -xzC /bin
```

Expand Down
2 changes: 1 addition & 1 deletion buildpacks/buildpack-go/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v157
v160
2 changes: 1 addition & 1 deletion buildpacks/buildpack-gradle/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v35
v36
2 changes: 1 addition & 1 deletion buildpacks/buildpack-php/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v201
v205
2 changes: 1 addition & 1 deletion buildpacks/buildpack-python/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v204
v205
2 changes: 1 addition & 1 deletion buildpacks/buildpack-ruby/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v232
v236
2 changes: 1 addition & 1 deletion buildpacks/buildpack-static/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v15
v16

0 comments on commit b9c5c81

Please sign in to comment.