Skip to content

Commit

Permalink
Merge pull request #723 from gliderlabs/master
Browse files Browse the repository at this point in the history
Release v0.5.32
  • Loading branch information
josegonzalez authored Nov 7, 2021
2 parents c2c0b66 + 65d6aa5 commit ef7c13f
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 25 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
32 changes: 16 additions & 16 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ 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 \
&& ln -s /bin/herokuish /start \
&& 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
10 changes: 8 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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
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.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.

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.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
```

Expand Down
2 changes: 1 addition & 1 deletion buildpacks/buildpack-php/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v199
v200
2 changes: 1 addition & 1 deletion buildpacks/buildpack-python/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v201
v202
2 changes: 1 addition & 1 deletion buildpacks/buildpack-ruby/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v230
v231
2 changes: 1 addition & 1 deletion buildpacks/buildpack-static/buildpack-url
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://github.com/dokku/buildpack-nginx
https://github.com/dokku/heroku-buildpack-nginx
2 changes: 1 addition & 1 deletion buildpacks/buildpack-static/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v14
v15

0 comments on commit ef7c13f

Please sign in to comment.