Skip to content

Commit

Permalink
Merge pull request #686 from gliderlabs/master
Browse files Browse the repository at this point in the history
Release v0.5.28
  • Loading branch information
josegonzalez authored Jun 28, 2021
2 parents 8ec32c4 + 47e998d commit 323e8dc
Show file tree
Hide file tree
Showing 41 changed files with 682 additions and 1,776 deletions.
24 changes: 18 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,30 @@
# Change Log
All notable changes to this project will be documented in this file.

## [0.5.28](https://github.com/gliderlabs/herokuish/compare/v0.5.27...v0.5.28) - 2021-06-28

### Changed

- @dependabot Bump django from 1.11.29 to 2.2.24 in /buildpacks/buildpack-python/tests/python-django #678
- @dependabot Bump symfony/http-foundation from 3.2.7 to 3.4.47 in /buildpacks/buildpack-php/tests/php #685
- @josegonzalez Update nodejs to version v185 #680
- @josegonzalez Update php to version v194 #682
- @josegonzalez Update python to version v196 #681
- @josegonzalez Update ruby to version v228 #683
- @josegonzalez Update test php app so composer can handle it properly #684

## [0.5.27](https://github.com/gliderlabs/herokuish/compare/v0.5.26...v0.5.27) - 2021-03-25

### Changed
- @dependabot Bump jinja2 from 2.10.1 to 2.11.3 in /buildpacks/buildpack-multi/tests/multi #661
- @dependabot Bump jinja2 from 2.10.1 to 2.11.3 in /buildpacks/buildpack-python/tests/python-flask #660
- @josegonzalez Drop non-buildpack related files #662
- @dependabot Update ruby to version v225 #667
- @dependabot Update scala to version v90 #666
- @dependabot Update php to version v190 #665
- @dependabot Update go to version v153 #664
- @dependabot Ensure there is parity between the primary and dev images #668
- @dependabot Prepare permissions quicker for slower filesystems #663
- @josegonzalez Update ruby to version v225 #667
- @josegonzalez Update scala to version v90 #666
- @josegonzalez Update php to version v190 #665
- @josegonzalez Update go to version v153 #664
- @josegonzalez Ensure there is parity between the primary and dev images #668
- @josegonzalez Prepare permissions quicker for slower filesystems #663

## [0.5.26](https://github.com/gliderlabs/herokuish/compare/v0.5.25...v0.5.26) - 2021-02-25

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.27/herokuish_0.5.27_linux_x86_64.tgz" \
RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.28/herokuish_0.5.28_linux_x86_64.tgz" \
--silent -L | tar -xzC /bin
RUN /bin/herokuish buildpack install \
&& ln -s /bin/herokuish /build \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
NAME = herokuish
DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku'
HARDWARE = $(shell uname -m)
VERSION ?= 0.5.27
VERSION ?= 0.5.28
IMAGE_NAME ?= $(NAME)
BUILD_TAG ?= dev
PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish
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 @@

[![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.27-blue)](https://hub.docker.com/r/gliderlabs/herokuish)
[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.28-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:

```
RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.27/herokuish_0.5.27_linux_x86_64.tgz \
RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.28/herokuish_0.5.28_linux_x86_64.tgz \
| tar -xzC /bin
```

Expand Down
2 changes: 1 addition & 1 deletion buildpacks/buildpack-nodejs/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v183
v185
2 changes: 1 addition & 1 deletion buildpacks/buildpack-php/buildpack-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v190
v194
10 changes: 0 additions & 10 deletions buildpacks/buildpack-php/tests/php/.env

This file was deleted.

2 changes: 2 additions & 0 deletions buildpacks/buildpack-php/tests/php/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
vendor/
.env
2 changes: 1 addition & 1 deletion buildpacks/buildpack-php/tests/php/Procfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
web: heroku-php-nginx -C nginx.conf public/
web: vendor/bin/heroku-php-apache2 web/
28 changes: 28 additions & 0 deletions buildpacks/buildpack-php/tests/php/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
# php-getting-started

A barebones PHP app that makes use of the [Silex](http://silex.sensiolabs.org/) web framework, which can easily be deployed to Heroku.

This application supports the [Getting Started with PHP on Heroku](https://devcenter.heroku.com/articles/getting-started-with-php) article - check it out.

## Deploying

Install the [Heroku Toolbelt](https://toolbelt.heroku.com/).

```sh
$ git clone [email protected]:heroku/php-getting-started.git # or clone your own fork
$ cd php-getting-started
$ heroku create
$ git push heroku main
$ heroku open
```

or

[![Deploy to Heroku](https://www.herokucdn.com/deploy/button.png)](https://heroku.com/deploy)

## Documentation

For more information about using PHP on Heroku, see these Dev Center articles:

- [Getting Started with PHP on Heroku](https://devcenter.heroku.com/articles/getting-started-with-php)
- [PHP on Heroku](https://devcenter.heroku.com/categories/php)
6 changes: 6 additions & 0 deletions buildpacks/buildpack-php/tests/php/app.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"name": "Start on Heroku: PHP",
"description": "A barebones PHP app that makes use of the Silex web framework",
"repository": "https://github.com/heroku/php-getting-started",
"addons": []
}
39 changes: 0 additions & 39 deletions buildpacks/buildpack-php/tests/php/bin/console

This file was deleted.

66 changes: 9 additions & 57 deletions buildpacks/buildpack-php/tests/php/composer.json
Original file line number Diff line number Diff line change
@@ -1,59 +1,11 @@
{
"type": "project",
"license": "proprietary",
"require": {
"php": "^7.1.3",
"ext-iconv": "*",
"symfony/console": "^4.0",
"symfony/dotenv": "^4.0",
"symfony/flex": "^1.0",
"symfony/framework-bundle": "^4.0",
"symfony/lts": "^4@dev",
"symfony/yaml": "^4.0"
},
"require-dev": {
},
"config": {
"preferred-install": {
"*": "dist"
},
"sort-packages": true
},
"autoload": {
"psr-4": {
"App\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"App\\Tests\\": "tests/"
}
},
"replace": {
"symfony/polyfill-iconv": "*",
"symfony/polyfill-php71": "*",
"symfony/polyfill-php70": "*",
"symfony/polyfill-php56": "*"
},
"scripts": {
"auto-scripts": {
"cache:clear": "symfony-cmd",
"assets:install --symlink --relative %PUBLIC_DIR%": "symfony-cmd"
},
"post-install-cmd": [
"@auto-scripts"
],
"post-update-cmd": [
"@auto-scripts"
]
},
"conflict": {
"symfony/symfony": "*"
},
"extra": {
"symfony": {
"id": "01C6AHK7W0MF7B3Y731AE1K37E",
"allow-contrib": false
}
}
"require" : {
"silex/silex": "^2.0.4",
"monolog/monolog": "^1.22",
"twig/twig": "^2.0",
"symfony/twig-bridge": "^3"
},
"require-dev": {
"heroku/heroku-buildpack-php": "*"
}
}
Loading

0 comments on commit 323e8dc

Please sign in to comment.