From df094f015c42cad75d8c10dd9ce3fcec2c0f3677 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 5 Jul 2019 18:35:11 -0400 Subject: [PATCH 001/871] chore: update changelog --- CHANGELOG.md | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 686a00ff6..04cba9989 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,22 @@ All notable changes to this project will be documented in this file. ### Changed +## [0.5.1] - 2019-07-05 +### Added +- @josegonzalez Use go modules + +### Changed +- @josegonzalez Allow using an system bash via BASH_BIN +- @josegonzalez Correct outdated dependencies +- @josegonzalez Update go to version v119 +- @josegonzalez Update gradle to version v30 +- @josegonzalez Update nodejs to version v157 +- @josegonzalez Update php to version v158 +- @josegonzalez Update python to version v153 +- @josegonzalez Update ruby to version v201 +- @josegonzalez Update scala to version v85 +- @josegonzalez Update static to version v11 + ## [0.5.0] - 2019-03-14 ### Changed - @swistaczek Bump heroku stack to Heroku:18 @@ -556,7 +572,8 @@ All notable changes to this project will be documented in this file. - User for `buildpack-build` is `$USER` or randomized - User for `procfile-exec` is `$USER` or detected from `/app` -[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.5.0...HEAD +[unreleased]: https://github.com/gliderlabs/herokuish/compare/v0.5.1...HEAD +[0.5.1]: https://github.com/gliderlabs/herokuish/compare/v0.5.0...v0.5.1 [0.5.0]: https://github.com/gliderlabs/herokuish/compare/v0.4.10...v0.5.0 [0.4.10]: https://github.com/gliderlabs/herokuish/compare/v0.4.9...v0.4.10 [0.4.9]: https://github.com/gliderlabs/herokuish/compare/v0.4.8...v0.4.9 From 81e2c58564c793d69046acd7c676514f8a1fe11f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Oct 2021 08:19:52 -0400 Subject: [PATCH 002/871] fix: correct the release make target so it can run on ci --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 17b812d83..8ac8f8ad4 100644 --- a/Makefile +++ b/Makefile @@ -149,7 +149,8 @@ lint: @echo linting... shellcheck -e SC2002,SC2030,SC2031,SC2034 -s bash include/*.bash tests/**/tests.sh -release: build bin/gh-release +release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_amd64.deb bin/gh-release + 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 cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb From aa6575ec6036dc049c32d4317583a72c315b0551 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Oct 2021 10:34:29 -0400 Subject: [PATCH 003/871] fix: add missing SYSTEM_NAME env var for gh-release download --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 8ac8f8ad4..ef6d913c6 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,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 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev From 2ca1d4adfb80811aebe28a8f3991b75697c4dbec Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Oct 2021 12:37:02 -0400 Subject: [PATCH 004/871] fix: move env vars to release section of workflow --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6bb53fc2c..9b7b22d72 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,9 +17,6 @@ jobs: runs-on: ubuntu-18.04 strategy: fail-fast: true - env: - GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} steps: - uses: actions/checkout@v2 @@ -131,3 +128,6 @@ jobs: export PACKAGECLOUD_REPOSITORY=dokku/dokku make release release-packagecloud fi + env: + GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} + PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} From ceb41ba0d348a8fabc068a71ffe43fc14e0efefb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Oct 2021 14:01:24 -0400 Subject: [PATCH 005/871] fix: add missing docker login call --- .github/workflows/main.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9b7b22d72..c5aa9b76b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -121,6 +121,13 @@ jobs: with: name: build + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: release run: | if [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then From 12b764e1479e4aaaec050b31609363b5ae2090a9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 29 Oct 2021 10:06:35 -0400 Subject: [PATCH 006/871] Update ruby to version v231 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 76ff756f5211b706edcb9d9b16e466dbb12fadef Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 29 Oct 2021 10:06:41 -0400 Subject: [PATCH 007/871] Update php to version v200 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1be92e8ac59b94b35e7b770983a11d509f183288 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Nov 2021 20:59:29 -0400 Subject: [PATCH 008/871] chore: update clone url for buildpack --- buildpacks/buildpack-static/buildpack-url | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 427e02563e847e05c42a041404bf54a263ce0dff Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Nov 2021 21:00:19 -0400 Subject: [PATCH 009/871] fix: update buildpack version to fix issue with pcre downloads --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ae90251d55f55ae3124db42f24b9c8796055ffd4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Nov 2021 21:08:32 -0400 Subject: [PATCH 010/871] Update python to version v202 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 34ff101127a76094be30d10e8614a1a8bec04815 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Nov 2021 21:57:21 -0400 Subject: [PATCH 011/871] feat: update the release name and body after creation --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ef6d913c6..04a7f6a5b 100644 --- a/Makefile +++ b/Makefile @@ -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 From 65d6aa5e5fc9a324362451b10c7b577c45bc5f73 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 6 Nov 2021 22:16:11 -0400 Subject: [PATCH 012/871] Release v0.5.32 ### 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 --- CHANGELOG.md | 10 ++++++++++ Dockerfile | 32 ++++++++++++++++---------------- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 29 insertions(+), 19 deletions(-) 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 04a7f6a5b..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 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 ``` From 789eb521a8d429ca97dc7d7e25336178d51799ca Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 10 Nov 2021 12:31:45 -0500 Subject: [PATCH 013/871] Update ruby to version v232 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index df001f256..24d0ba759 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v231 +v232 From d3316601a0ebf34164a100ed3e3a05fba3fed2af Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 10 Nov 2021 12:31:47 -0500 Subject: [PATCH 014/871] Update python to version v203 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 2076b6e9d..c8821497c 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v202 +v203 From baf9fa1a9642fd1935cdecc84400e9004d87ed45 Mon Sep 17 00:00:00 2001 From: Ilya Semenov Date: Wed, 24 Nov 2021 18:30:43 +0700 Subject: [PATCH 015/871] fix: don't require binary in ci mode make --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index aa991290b..e9a265f24 100644 --- a/Makefile +++ b/Makefile @@ -51,11 +51,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 From b28db5f0257cbc18d0bbae0000dee138e3675152 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Nov 2021 23:57:21 -0500 Subject: [PATCH 016/871] Update python to version v204 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index c8821497c..5a383b1b7 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v203 +v204 From 4d43e0be70ee2ca6a540fe9f71d08fb4ef2a8639 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Nov 2021 23:57:26 -0500 Subject: [PATCH 017/871] Update php to version v201 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 3894671e6..1b4c45cc4 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v200 +v201 From fc99cfac786639c51ad15e3e0f34662b1791f4cf Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 30 Nov 2021 23:57:28 -0500 Subject: [PATCH 018/871] Update go to version v157 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index d2b8204b3..50440a0ba 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v156 +v157 From 71d9910c6fcf797ee2f47055c87d22835768a307 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 1 Dec 2021 10:37:27 -0500 Subject: [PATCH 019/871] Release v0.5.33 ### Changed - @josegonzalez Update ruby to version v232 #725 - @josegonzalez Update python to version v204 #727 - @josegonzalez Update php to version v201 #728 - @josegonzalez Update go to version v157 #729 --- .circleci/config.yml | 3 ++- CHANGELOG.md | 9 +++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index aab7ebccf..320b7805d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,12 +40,13 @@ jobs: - run: | echo "$DOCKERHUB_PASSWORD" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin - run: | - docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 --build-arg STACK_VERSION=18 . + docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest --build-arg STACK_VERSION=18 . - run: | docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 --build-arg STACK_VERSION=20 . - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 + docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fb28cf41..a724e2db3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.33](https://github.com/gliderlabs/herokuish/compare/v0.5.32...v0.5.33) - 2021-12-01 + +### Changed + +- @josegonzalez Update ruby to version v232 #725 +- @josegonzalez Update python to version v204 #727 +- @josegonzalez Update php to version v201 #728 +- @josegonzalez Update go to version v157 #729 + ## [0.5.32](https://github.com/gliderlabs/herokuish/compare/v0.5.31...v0.5.32) - 2021-11-06 ### Changed diff --git a/Dockerfile b/Dockerfile index d66cf071a..b624e56d3 100644 --- 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.32/herokuish_0.5.32_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.33/herokuish_0.5.33_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index aa991290b..ab8c9096d 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.32 +VERSION ?= 0.5.33 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 4eb7c3716..55c16349b 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.32-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.33-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.32/herokuish_0.5.32_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.33/herokuish_0.5.33_linux_x86_64.tgz \ | tar -xzC /bin ``` From c733affa27ac485916db07e0d250564f7b24b669 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 1 Dec 2021 11:55:33 -0500 Subject: [PATCH 020/871] fix: add missing variables for gh-release-body --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index ab8c9096d..9e0643791 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,6 @@ 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:]') From 9198065999364273116358de39ea2c5e725660fa Mon Sep 17 00:00:00 2001 From: Justin Reasoner Date: Fri, 7 Jan 2022 09:04:47 -0500 Subject: [PATCH 021/871] Update php to version v205 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 1b4c45cc4..82eb703eb 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v201 +v205 From 1bd1c2cf0577225aca1f8580e73057c6800e8c7e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 7 Jan 2022 16:59:03 -0500 Subject: [PATCH 022/871] Update ruby to version v236 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 24d0ba759..6fdce0bc6 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v232 +v236 From 003e0da44ae1ede95ff7fc66aee0fafaf7d3c270 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 7 Jan 2022 16:59:05 -0500 Subject: [PATCH 023/871] Update python to version v205 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 5a383b1b7..82eb703eb 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v204 +v205 From 809616fc0546bbe0b02e0b4c82ad95d90e269cdb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 7 Jan 2022 16:59:06 -0500 Subject: [PATCH 024/871] Update gradle to version v36 --- buildpacks/buildpack-gradle/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-gradle/buildpack-version b/buildpacks/buildpack-gradle/buildpack-version index f576fa699..c5d5851e1 100644 --- a/buildpacks/buildpack-gradle/buildpack-version +++ b/buildpacks/buildpack-gradle/buildpack-version @@ -1 +1 @@ -v35 +v36 From feec26b2283d25ac2bc1e83adc89bf8ea3fe37a2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 7 Jan 2022 16:59:08 -0500 Subject: [PATCH 025/871] Update go to version v160 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 50440a0ba..925e38e2b 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v157 +v160 From 058c350138d9a1586505b8d364fac0076e6c62b7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 7 Jan 2022 16:59:09 -0500 Subject: [PATCH 026/871] Update static to version v16 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 75701b229..6f7f377bf 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v15 +v16 From 9a12032c9b053e145805fd13b4288cab8dcf88d7 Mon Sep 17 00:00:00 2001 From: Justin Reasoner Date: Tue, 18 Jan 2022 17:37:04 -0500 Subject: [PATCH 027/871] Release v0.5.34 --- CHANGELOG.md | 15 +++++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a724e2db3..788220533 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/Dockerfile b/Dockerfile index b624e56d3..351f61f66 100644 --- 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.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 \ diff --git a/Makefile b/Makefile index f5db3bce1..392aa38f8 100644 --- 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.33 +VERSION ?= 0.5.34 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 55c16349b..3abb47896 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.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. @@ -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 ``` From 897112551b97d6ccb413757c2d2e31ee3ebe4b3f Mon Sep 17 00:00:00 2001 From: Justin Reasoner Date: Wed, 26 Jan 2022 18:26:44 -0500 Subject: [PATCH 028/871] Add gliderlabs/herokuish:latest tagging Tags latest-18 build as `latest` as well --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4ce02dc35..4c8a50719 100644 --- 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: | From 49463dcd63518ede816be1e0a13f808d367c1cb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jan 2022 23:50:29 +0000 Subject: [PATCH 029/871] chore(deps): bump gopkg.in/yaml.v2 from 2.2.2 to 2.2.8 Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.2 to 2.2.8. - [Release notes](https://github.com/go-yaml/yaml/releases) - [Commits](https://github.com/go-yaml/yaml/compare/v2.2.2...v2.2.8) --- updated-dependencies: - dependency-name: gopkg.in/yaml.v2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index a2e1a5efd..fa0732a41 100644 --- a/go.mod +++ b/go.mod @@ -6,5 +6,5 @@ require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 - gopkg.in/yaml.v2 v2.2.2 + gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index 6f810dfb0..9bc67629a 100644 --- a/go.sum +++ b/go.sum @@ -4,6 +4,7 @@ github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 h1:pNf4kIAZbE5uKZ1tZAEXOvDcO7+32PeMOlAl85E8UU4= github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= From 0002d242c12d9353538a13615d4e7deec669b222 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:05:59 +0000 Subject: [PATCH 030/871] chore(deps): bump django Bumps [django](https://github.com/django/django) from 2.2.24 to 2.2.27. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.24...2.2.27) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index 6094cd15e..96c7a1323 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ -Django==2.2.24 +Django==2.2.27 gunicorn==19.5.0 From 7235021620aa2e0bd5027e8deb2a2faad17956c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 11 Feb 2022 03:32:43 +0000 Subject: [PATCH 031/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.3.0 to 2.14.11. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/v2.14.11/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.3.0...v2.14.11) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 224 ++++++++++++++++-- 1 file changed, 201 insertions(+), 23 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 2fe326a01..e7a264a71 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -527,23 +527,108 @@ "homepage": "https://symfony.com", "time": "2017-04-05T12:52:03+00:00" }, + { + "name": "symfony/polyfill-ctype", + "version": "v1.24.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "30885182c981ab175d4d034db0f6f469898070ab" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", + "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-10-20T20:35:02+00:00" + }, { "name": "symfony/polyfill-mbstring", - "version": "v1.23.0", + "version": "v1.24.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1" + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2df51500adbaebdc4c38dea4c89a2e131c45c8a1", - "reference": "2df51500adbaebdc4c38dea4c89a2e131c45c8a1", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", + "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", "shasum": "" }, "require": { "php": ">=7.1" }, + "provide": { + "ext-mbstring": "*" + }, "suggest": { "ext-mbstring": "For best performance" }, @@ -589,7 +674,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.23.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" }, "funding": [ { @@ -605,7 +690,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:27:20+00:00" + "time": "2021-11-30T18:21:41+00:00" }, { "name": "symfony/polyfill-php70", @@ -675,6 +760,82 @@ ], "time": "2020-10-23T14:02:19+00:00" }, + { + "name": "symfony/polyfill-php72", + "version": "v1.24.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", + "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.23-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-27T09:17:38+00:00" + }, { "name": "symfony/routing", "version": "v3.2.7", @@ -833,36 +994,40 @@ }, { "name": "twig/twig", - "version": "v2.3.0", + "version": "v2.14.11", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9718186a5df85a4f7917e78d3ffcabc204c75d25" + "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9718186a5df85a4f7917e78d3ffcabc204c75d25", - "reference": "9718186a5df85a4f7917e78d3ffcabc204c75d25", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", + "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", "shasum": "" }, "require": { - "php": "^7.0", - "symfony/polyfill-mbstring": "~1.0" + "php": ">=7.1.3", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php72": "^1.8" }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.14-dev" } }, "autoload": { "psr-0": { "Twig_": "lib/" + }, + "psr-4": { + "Twig\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -876,23 +1041,36 @@ "homepage": "http://fabien.potencier.org", "role": "Lead Developer" }, + { + "name": "Twig Team", + "role": "Contributors" + }, { "name": "Armin Ronacher", "email": "armin.ronacher@active-4.com", "role": "Project Founder" - }, - { - "name": "Twig Team", - "homepage": "http://twig.sensiolabs.org/contributors", - "role": "Contributors" } ], "description": "Twig, the flexible, fast, and secure template language for PHP", - "homepage": "http://twig.sensiolabs.org", + "homepage": "https://twig.symfony.com", "keywords": [ "templating" ], - "time": "2017-03-22T15:41:51+00:00" + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2022-02-04T06:57:25+00:00" } ], "packages-dev": [ @@ -948,5 +1126,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" } From 374c93753d3b13ecaedf13643a5bbdbf14d3241d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 22:03:52 -0500 Subject: [PATCH 032/871] fix: pin to a version of markupsafe that works with older jinja2 This is fine as it is just to check that a buildpack installs dependencies. These apps aren't in direct use otherwise. Refs pallets/markupsafe#284 --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 94493ee43..2cac3f5a2 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,3 +1,4 @@ Flask==1.0 Jinja2==2.11.3 gunicorn==19.5.0 +markupsafe==2.0.1 From 2b4acaefaabef17bde6ffcd9a6e1b28627fc940c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 26 Feb 2022 00:10:33 -0500 Subject: [PATCH 033/871] fix: upgrade flask to fix issue with itsdangerous --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 2cac3f5a2..5eb1826f1 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==1.0 +Flask==1.1.4 Jinja2==2.11.3 gunicorn==19.5.0 markupsafe==2.0.1 From 60cd2d397bf0935b56a29569c3f08dcde39f37e6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 26 Feb 2022 01:29:00 -0500 Subject: [PATCH 034/871] fix: update dependencies in python buildpack test --- .../buildpack-python/tests/python-flask/requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 94493ee43..5eb1826f1 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/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 From 87334bb34b3dd6c70650e1f34641784be841d1d9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 12:57:57 -0500 Subject: [PATCH 035/871] Update nodejs to version v192 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 306e236c7..e23f9bdb6 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v189 +v192 From c9fdc045172468b2bb2b66506d086c47eb3a1432 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 12:58:03 -0500 Subject: [PATCH 036/871] Update php to version v212 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 82eb703eb..03493f92b 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v205 +v212 From 0bd0bc2df32322112d9bb05a97073a3364c51041 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 12:57:56 -0500 Subject: [PATCH 037/871] Update ruby to version v237 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 6fdce0bc6..529193d15 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v236 +v237 From acf159b2ebdbbbea794cdfd53bf8649190ffb390 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 12:57:59 -0500 Subject: [PATCH 038/871] Update python to version v206 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 82eb703eb..2b71f6ac3 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v205 +v206 From e3700316c6e0e6942e59a839a5702172830de429 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 25 Feb 2022 12:58:01 -0500 Subject: [PATCH 039/871] Update scala to version v92 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index 118ad6371..c7fff8496 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v91 +v92 From 07432d7d4ad04b826c52113b8794accbcebe47dc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 00:37:42 +0000 Subject: [PATCH 040/871] chore(deps): bump symfony/http-kernel Bumps [symfony/http-kernel](https://github.com/symfony/http-kernel) from 3.2.7 to 3.4.49. - [Release notes](https://github.com/symfony/http-kernel/releases) - [Changelog](https://github.com/symfony/http-kernel/blob/5.4/CHANGELOG.md) - [Commits](https://github.com/symfony/http-kernel/compare/v3.2.7...v3.4.49) --- updated-dependencies: - dependency-name: symfony/http-kernel dependency-type: indirect ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 282 +++++++++++++----- 1 file changed, 200 insertions(+), 82 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index e7a264a71..db0c83e27 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -132,16 +132,16 @@ }, { "name": "psr/log", - "version": "1.0.2", + "version": "1.1.4", "source": { "type": "git", "url": "https://github.com/php-fig/log.git", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d" + "reference": "d49695b909c3b7628b6289db5479a1c204601f11" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", - "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d", + "url": "https://api.github.com/repos/php-fig/log/zipball/d49695b909c3b7628b6289db5479a1c204601f11", + "reference": "d49695b909c3b7628b6289db5479a1c204601f11", "shasum": "" }, "require": { @@ -150,7 +150,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.1.x-dev" } }, "autoload": { @@ -165,7 +165,7 @@ "authors": [ { "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "homepage": "https://www.php-fig.org/" } ], "description": "Common interface for logging libraries", @@ -175,7 +175,10 @@ "psr", "psr-3" ], - "time": "2016-10-10T12:19:37+00:00" + "support": { + "source": "https://github.com/php-fig/log/tree/1.1.4" + }, + "time": "2021-05-03T11:20:27+00:00" }, { "name": "silex/silex", @@ -264,35 +267,29 @@ }, { "name": "symfony/debug", - "version": "v3.2.7", + "version": "v4.4.37", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "56f613406446a4a0a031475cfd0a01751de22659" + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659", - "reference": "56f613406446a4a0a031475cfd0a01751de22659", + "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", + "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", "shasum": "" }, "require": { - "php": ">=5.5.9", - "psr/log": "~1.0" + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" }, "conflict": { - "symfony/http-kernel": ">=2.3,<2.3.24|~2.4.0|>=2.5,<2.5.9|>=2.6,<2.6.2" + "symfony/http-kernel": "<3.4" }, "require-dev": { - "symfony/class-loader": "~2.8|~3.0", - "symfony/http-kernel": "~2.8|~3.0" + "symfony/http-kernel": "^3.4|^4.0|^5.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Debug\\": "" @@ -315,44 +312,60 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Debug Component", + "description": "Provides tools to ease debugging PHP code", "homepage": "https://symfony.com", - "time": "2017-03-28T21:38:24+00:00" + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.37" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:41:36+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v3.2.7", + "version": "v3.4.47", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca" + "reference": "31fde73757b6bad247c54597beef974919ec6860" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/154bb1ef7b0e42ccc792bd53edbce18ed73440ca", - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860", + "reference": "31fde73757b6bad247c54597beef974919ec6860", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^5.5.9|>=7.0.8" + }, + "conflict": { + "symfony/dependency-injection": "<3.3" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/debug": "~3.4|~4.4", + "symfony/dependency-injection": "~3.3|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0" }, "suggest": { "symfony/dependency-injection": "", "symfony/http-kernel": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\EventDispatcher\\": "" @@ -377,7 +390,24 @@ ], "description": "Symfony EventDispatcher Component", "homepage": "https://symfony.com", - "time": "2017-04-04T07:26:27+00:00" + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v3.4.47" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-24T10:57:07+00:00" }, { "name": "symfony/http-foundation", @@ -447,48 +477,56 @@ }, { "name": "symfony/http-kernel", - "version": "v3.2.7", + "version": "v3.4.49", "source": { "type": "git", "url": "https://github.com/symfony/http-kernel.git", - "reference": "8285ab5faf1306b1a5ebcf287fe91c231a6de88e" + "reference": "5aa72405f5bd5583c36ed6e756acb17d3f98ac40" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/8285ab5faf1306b1a5ebcf287fe91c231a6de88e", - "reference": "8285ab5faf1306b1a5ebcf287fe91c231a6de88e", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5aa72405f5bd5583c36ed6e756acb17d3f98ac40", + "reference": "5aa72405f5bd5583c36ed6e756acb17d3f98ac40", "shasum": "" }, "require": { - "php": ">=5.5.9", + "php": "^5.5.9|>=7.0.8", "psr/log": "~1.0", - "symfony/debug": "~2.8|~3.0", - "symfony/event-dispatcher": "~2.8|~3.0", - "symfony/http-foundation": "~2.8.13|~3.1.6|~3.2" + "symfony/debug": "^3.3.3|~4.0", + "symfony/event-dispatcher": "~2.8|~3.0|~4.0", + "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1", + "symfony/polyfill-ctype": "~1.8", + "symfony/polyfill-php56": "~1.8" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<2.8", + "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4", + "symfony/var-dumper": "<3.3", + "twig/twig": "<1.34|<2.4,>=2" + }, + "provide": { + "psr/log-implementation": "1.0" }, "require-dev": { - "symfony/browser-kit": "~2.8|~3.0", + "psr/cache": "~1.0", + "symfony/browser-kit": "~2.8|~3.0|~4.0", "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/css-selector": "~2.8|~3.0", - "symfony/dependency-injection": "~2.8|~3.0", - "symfony/dom-crawler": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/process": "~2.8|~3.0", - "symfony/routing": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~3.2" + "symfony/config": "~2.8|~3.0|~4.0", + "symfony/console": "~2.8|~3.0|~4.0", + "symfony/css-selector": "~2.8|~3.0|~4.0", + "symfony/dependency-injection": "^3.4.10|^4.0.10", + "symfony/dom-crawler": "~2.8|~3.0|~4.0", + "symfony/expression-language": "~2.8|~3.0|~4.0", + "symfony/finder": "~2.8|~3.0|~4.0", + "symfony/process": "~2.8|~3.0|~4.0", + "symfony/routing": "~3.4|~4.0", + "symfony/stopwatch": "~2.8|~3.0|~4.0", + "symfony/templating": "~2.8|~3.0|~4.0", + "symfony/translation": "~2.8|~3.0|~4.0", + "symfony/var-dumper": "~3.3|~4.0" }, "suggest": { "symfony/browser-kit": "", - "symfony/class-loader": "", "symfony/config": "", "symfony/console": "", "symfony/dependency-injection": "", @@ -496,11 +534,6 @@ "symfony/var-dumper": "" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\HttpKernel\\": "" @@ -525,11 +558,28 @@ ], "description": "Symfony HttpKernel Component", "homepage": "https://symfony.com", - "time": "2017-04-05T12:52:03+00:00" + "support": { + "source": "https://github.com/symfony/http-kernel/tree/v3.4.49" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-05-19T12:06:59+00:00" }, { "name": "symfony/polyfill-ctype", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -561,12 +611,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -591,7 +641,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" }, "funding": [ { @@ -611,7 +661,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -643,12 +693,12 @@ } }, "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Mbstring\\": "" - }, "files": [ "bootstrap.php" - ] + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -674,7 +724,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" }, "funding": [ { @@ -692,6 +742,74 @@ ], "time": "2021-11-30T18:21:41+00:00" }, + { + "name": "symfony/polyfill-php56", + "version": "v1.20.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php56.git", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "metapackage", + "extra": { + "branch-alias": { + "dev-main": "1.20-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2020-10-23T14:02:19+00:00" + }, { "name": "symfony/polyfill-php70", "version": "v1.20.0", @@ -762,7 +880,7 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.24.0", + "version": "v1.25.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", @@ -818,7 +936,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.24.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0" }, "funding": [ { From a31a43420882f89b5b4e6269dd783dd2131331d5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 1 Apr 2022 17:24:36 -0400 Subject: [PATCH 041/871] Update ruby to version v239 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 529193d15..29b3cfb96 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v237 +v239 From a487d14398472ef6b4b738f8200c08b7f0147f33 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 1 Apr 2022 17:24:36 -0400 Subject: [PATCH 042/871] Update nodejs to version v193 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index e23f9bdb6..275de7953 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v192 +v193 From 0b81fee00f438b2827b3be4821eff9e2c1cf1c16 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 1 Apr 2022 17:24:37 -0400 Subject: [PATCH 043/871] Update python to version v209 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 2b71f6ac3..10f007a59 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v206 +v209 From 39116ad22bec47b033aa1488b9a1ad2b44709e1d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 1 Apr 2022 17:24:38 -0400 Subject: [PATCH 044/871] Update php to version v213 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 03493f92b..2b391c624 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v212 +v213 From d40e126826e52e3bf7e5ba053c208ea4e2022b6c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 1 Apr 2022 17:24:39 -0400 Subject: [PATCH 045/871] Update go to version v161 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 925e38e2b..21a043817 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v160 +v161 From 777b824272d017c9246710833c6a20c6987ef6a3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 8 Apr 2022 20:48:48 -0400 Subject: [PATCH 046/871] Update ruby to version v240 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 29b3cfb96..8c9e1ccb4 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v239 +v240 From 59bdf48848ac58ecf7cd7939604a16d15ae08273 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 8 Apr 2022 20:48:51 -0400 Subject: [PATCH 047/871] Update php to version v215 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 2b391c624..1ffbdb7c1 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v213 +v215 From 43c21a218a774da24db46c065ae26902eafb8877 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 8 Apr 2022 20:56:05 -0400 Subject: [PATCH 048/871] feat: upgrade to golang 1.17.8 --- .github/workflows/main.yml | 4 ++-- Dockerfile.build | 2 +- go.mod | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5aa9b76b..bf669c5b3 100644 --- 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/Dockerfile.build b/Dockerfile.build index a9e1faf92..87aaa770e 100644 --- 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/go.mod b/go.mod index fa0732a41..e5f038985 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module herokuish -go 1.12 +go 1.17.8 require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect From e455f6c58953bc8c6666d59157773f4431113cd3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 8 Apr 2022 21:14:45 -0400 Subject: [PATCH 049/871] fix: use correct version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index e5f038985..d25e6807d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module herokuish -go 1.17.8 +go 1.17 require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect From 97bb6cbf145705a857ff745d980fabbaccf90511 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Apr 2022 10:23:20 -0400 Subject: [PATCH 050/871] Update nodejs to version v195 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 275de7953..bd80f5c1e 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v193 +v195 From 6eae69802fbd1ee937e12cabc273fe24b9b36c1f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Apr 2022 10:23:20 -0400 Subject: [PATCH 051/871] Update python to version v210 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 10f007a59..efa278214 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v209 +v210 From 58ec88078202bffd4afec374dd2bd741a7ef8186 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 22 Apr 2022 10:23:21 -0400 Subject: [PATCH 052/871] Update php to version v216 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 1ffbdb7c1..5f967adee 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v215 +v216 From c5bd82ad0d53c6d816eac75fe6d9fd8455dc8b19 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 22 Apr 2022 23:38:38 +0000 Subject: [PATCH 053/871] chore(deps): bump django Bumps [django](https://github.com/django/django) from 2.2.27 to 2.2.28. - [Release notes](https://github.com/django/django/releases) - [Commits](https://github.com/django/django/compare/2.2.27...2.2.28) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index 96c7a1323..e5c54d7a6 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ -Django==2.2.27 +Django==2.2.28 gunicorn==19.5.0 From 150e419aac7732cedb6c2b68301e2f6b3d5f8322 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 6 May 2022 10:44:58 -0400 Subject: [PATCH 054/871] Release 0.5.35 ### 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 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 41 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a724e2db3..e0ad5f1a4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,43 @@ # 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 + +- @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 diff --git a/Dockerfile b/Dockerfile index b624e56d3..cab4e3489 100644 --- 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.33/herokuish_0.5.33_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/Makefile b/Makefile index f5db3bce1..6f90d8325 100644 --- 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.33 +VERSION ?= 0.5.35 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 55c16349b..253ac64af 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.33-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.33/herokuish_0.5.33_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 ``` From 1932ad8374beaa4ecc7e3383044776434431deca Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 10 May 2022 19:52:24 -0400 Subject: [PATCH 055/871] chore: publish package for Ubuntu 22.04 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 6f90d8325..32afcdf03 100644 --- a/Makefile +++ b/Makefile @@ -176,6 +176,7 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/xenial build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_amd64.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb From df7178706865613fe81e2a019733fa9a66b79d7c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 24 May 2022 11:59:39 -0400 Subject: [PATCH 056/871] Update java to version v70 --- buildpacks/buildpack-java/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/buildpack-version b/buildpacks/buildpack-java/buildpack-version index a472967f1..406038bc7 100644 --- a/buildpacks/buildpack-java/buildpack-version +++ b/buildpacks/buildpack-java/buildpack-version @@ -1 +1 @@ -v69 +v70 From 232afdb9ef3b53f7475219434d0dfd85bcee9ec6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 24 May 2022 11:59:39 -0400 Subject: [PATCH 057/871] Update python to version v211 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index efa278214..7e4ba5f8e 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v210 +v211 From a91af4016a0ae6ce3e4318c5048a4782aca71527 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 24 May 2022 11:59:40 -0400 Subject: [PATCH 058/871] Update go to version v162 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 21a043817..67ea37f54 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v161 +v162 From acb60a8bc47a4177282b2f25cd3a98505a9b97c2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 24 May 2022 11:59:40 -0400 Subject: [PATCH 059/871] Update php to version v217 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 5f967adee..a8645e2be 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v216 +v217 From 6eb3ca31940e82b8065abf034dd0963f62b5de2c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 Jun 2022 10:50:10 -0400 Subject: [PATCH 060/871] Update nodejs to version v196 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index bd80f5c1e..284af8797 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v195 +v196 From 9300fd32ea442f0d8fb747e8e4309e2a10b27e81 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 Jun 2022 10:50:12 -0400 Subject: [PATCH 061/871] Update php to version v218 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index a8645e2be..975955610 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v217 +v218 From a7af8bd6e90a6d09f2786f0b93563d15936a19fd Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 Jun 2022 11:18:19 -0400 Subject: [PATCH 062/871] refactor: switch to dokku/heroku-buildpack-multi to enable better debugging --- buildpacks/buildpack-multi/buildpack-url | 2 +- buildpacks/buildpack-multi/buildpack-version | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-multi/buildpack-url b/buildpacks/buildpack-multi/buildpack-url index ef13e6c66..1b18f18b9 100644 --- a/buildpacks/buildpack-multi/buildpack-url +++ b/buildpacks/buildpack-multi/buildpack-url @@ -1 +1 @@ -https://github.com/heroku/heroku-buildpack-multi +https://github.com/dokku/heroku-buildpack-multi diff --git a/buildpacks/buildpack-multi/buildpack-version b/buildpacks/buildpack-multi/buildpack-version index 0ec25f750..79127d85a 100644 --- a/buildpacks/buildpack-multi/buildpack-version +++ b/buildpacks/buildpack-multi/buildpack-version @@ -1 +1 @@ -v1.0.0 +v1.2.0 From 580bc244bde5025573e562775504efc8e6a2336f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 6 Jun 2022 11:59:30 -0400 Subject: [PATCH 063/871] Release v0.5.36 --- CHANGELOG.md | 16 ++++++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e0ad5f1a4..21d7f45d2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,22 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.36](https://github.com/gliderlabs/herokuish/compare/v0.5.35...v0.5.36) - 2021-06-06 + +### Added + +- @josegonzalez Publish package for Ubuntu 22.04 #766 + +### Changed + +- @josegonzalez Switch to dokku/heroku-buildpack-multi to enable better debugging #773 +- @josegonzalez Update php to version v218 #772 +- @josegonzalez Update nodejs to version v196 #771 +- @josegonzalez Update python to version v211 #770 +- @josegonzalez Update php to version v217 #769 +- @josegonzalez Update java to version v70 #768 +- @josegonzalez Update go to version v162 #767 + ## [0.5.35](https://github.com/gliderlabs/herokuish/compare/v0.5.34...v0.5.35) - 2021-05-06 ### Changed diff --git a/Dockerfile b/Dockerfile index cab4e3489..8709b6281 100644 --- 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.35/herokuish_0.5.35_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.36/herokuish_0.5.36_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index 32afcdf03..43c8e418a 100644 --- 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.35 +VERSION ?= 0.5.36 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 253ac64af..876f5f1c0 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.35-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.36-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.35/herokuish_0.5.35_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.36/herokuish_0.5.36_linux_x86_64.tgz \ | tar -xzC /bin ``` From b587914dd241a8937b62b4ff075ea5e8c448fa0b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:01 -0400 Subject: [PATCH 064/871] Update nodejs to version v198 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 284af8797..bc579f822 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v196 +v198 From a5f339db5761458b7166d8aff0c7815cbd66bb96 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:01 -0400 Subject: [PATCH 065/871] Update ruby to version v243 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 8c9e1ccb4..6b1dadddb 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v240 +v243 From e4b54b1a91915bb7116056dfcb7ece82e053fccb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:02 -0400 Subject: [PATCH 066/871] Update clojure to version v90 --- buildpacks/buildpack-clojure/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-clojure/buildpack-version b/buildpacks/buildpack-clojure/buildpack-version index 8ea770dff..05068acde 100644 --- a/buildpacks/buildpack-clojure/buildpack-version +++ b/buildpacks/buildpack-clojure/buildpack-version @@ -1 +1 @@ -v87 +v90 From 4dd81e599eff73ebfc741b21d11a63f1b114a02a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:02 -0400 Subject: [PATCH 067/871] Update python to version v213 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 7e4ba5f8e..2b391c624 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v211 +v213 From 778106d7ee66383f4eb77b7ee66b856b56010b33 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:03 -0400 Subject: [PATCH 068/871] Update gradle to version v38 --- buildpacks/buildpack-gradle/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-gradle/buildpack-version b/buildpacks/buildpack-gradle/buildpack-version index c5d5851e1..3cac86345 100644 --- a/buildpacks/buildpack-gradle/buildpack-version +++ b/buildpacks/buildpack-gradle/buildpack-version @@ -1 +1 @@ -v36 +v38 From 2532b73b388a2e5cb5cec7b9d19be4e89457f80d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:03 -0400 Subject: [PATCH 069/871] Update java to version v72 --- buildpacks/buildpack-java/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/buildpack-version b/buildpacks/buildpack-java/buildpack-version index 406038bc7..81d2be9e9 100644 --- a/buildpacks/buildpack-java/buildpack-version +++ b/buildpacks/buildpack-java/buildpack-version @@ -1 +1 @@ -v70 +v72 From d6b07c86eb73c9435729d1fa5576a13ed0e147cf Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:04 -0400 Subject: [PATCH 070/871] Update php to version v221 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 975955610..c00df0e59 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v218 +v221 From 8fc7420ed7cf331370d3b8d2e47d9adc5870508f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:04 -0400 Subject: [PATCH 071/871] Update scala to version v94 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index c7fff8496..4401de6eb 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v92 +v94 From 5d1129bc2c276c9e1dc8021a06b2b115eddb528a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 01:06:05 -0400 Subject: [PATCH 072/871] Update go to version v166 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 67ea37f54..27cfefe7d 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v162 +v166 From 46c573b44142c2d2b344e81d46fad8de071616ce Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 7 Jul 2022 14:24:15 -0400 Subject: [PATCH 073/871] Update php to version v222 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index c00df0e59..96ed0f2af 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v221 +v222 From 2cd6a9b3f12557abdf6da73cbf5b728607a7d654 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Aug 2022 01:46:42 -0400 Subject: [PATCH 074/871] Update ruby to version v244 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 6b1dadddb..1e48f7666 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v243 +v244 From 5fd814fadbb1a822bbf2e3238217797ba94bfa9a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Aug 2022 01:46:43 -0400 Subject: [PATCH 075/871] Update python to version v214 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 2b391c624..8e1a11531 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v213 +v214 From b22bcada966816b93ed22fde14e91a94f6d9131d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Aug 2022 01:46:44 -0400 Subject: [PATCH 076/871] Update php to version v223 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 96ed0f2af..9723eb6a0 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v222 +v223 From e6feecaee58c61a67f5d9aa757c0ce83e9099439 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 7 Aug 2022 12:41:21 -0400 Subject: [PATCH 077/871] Release 0.5.37 --- CHANGELOG.md | 14 ++++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 21d7f45d2..9a531c432 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,20 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.37](https://github.com/gliderlabs/herokuish/compare/v0.5.36...v0.5.37) - 2021-08-07 + +### Changed + +- @josegonzalez Update clojure to version v90 #775 +- @josegonzalez Update go to version v166 #776 +- @josegonzalez Update gradle to version v38 #777 +- @josegonzalez Update java to version v72 #778 +- @josegonzalez Update nodejs to version v198 #779 +- @josegonzalez Update php to version v223 #788 +- @josegonzalez Update python to version v214 #787 +- @josegonzalez Update ruby to version v244 #786 +- @josegonzalez Update scala to version v94 #783 + ## [0.5.36](https://github.com/gliderlabs/herokuish/compare/v0.5.35...v0.5.36) - 2021-06-06 ### Added diff --git a/Dockerfile b/Dockerfile index 8709b6281..4af99674e 100644 --- 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.36/herokuish_0.5.36_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.37/herokuish_0.5.37_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index 43c8e418a..5a9963efa 100644 --- 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.36 +VERSION ?= 0.5.37 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 876f5f1c0..94c8fecbd 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.36-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.37-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.36/herokuish_0.5.36_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.37/herokuish_0.5.37_linux_x86_64.tgz \ | tar -xzC /bin ``` From 8eef58a0531ba4cdf982ed3dfd37641eaaf96c74 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 31 Aug 2022 10:52:08 -0400 Subject: [PATCH 078/871] fix: upgrade ruby to fix fpm dependency --- .github/workflows/main.yml | 4 ++-- Makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bf669c5b3..3a490aa01 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.3 + ruby-version: 2.6 - uses: actions/setup-python@v2 with: @@ -114,7 +114,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.3 + ruby-version: 2.6 - name: download packages uses: actions/download-artifact@v1 diff --git a/Makefile b/Makefile index 5a9963efa..4a98be19a 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,13 @@ endif fpm: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v fpm >/dev/null || gem install fpm --no-ri --no-rdoc + command -v fpm >/dev/null || gem install fpm --no-rdoc endif package_cloud: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v package_cloud >/dev/null || gem install package_cloud --no-ri --no-rdoc + command -v package_cloud >/dev/null || gem install package_cloud --no-rdoc endif bindata.go: From 411cb1414f7fefba387859bdc72c9bf9a9b0b216 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:00:09 -0400 Subject: [PATCH 079/871] fix: use updated flag for no-document --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4a98be19a..0cf90b375 100644 --- a/Makefile +++ b/Makefile @@ -26,13 +26,13 @@ endif fpm: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v fpm >/dev/null || gem install fpm --no-rdoc + command -v fpm >/dev/null || gem install fpm --no-document endif package_cloud: ifeq ($(SYSTEM),Linux) sudo apt-get update && sudo apt-get -y install gcc git build-essential wget ruby-dev ruby1.9.1 lintian rpm help2man man-db - command -v package_cloud >/dev/null || gem install package_cloud --no-rdoc + command -v package_cloud >/dev/null || gem install package_cloud --no-document endif bindata.go: From e740089215fa5f5ba50b92dc92fec2c9187b08d2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:30 -0400 Subject: [PATCH 080/871] Update python to version v218 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 8e1a11531..975955610 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v214 +v218 From 5ae32a700ae8a06554e3e6e94e9940f6ff6b2d18 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:32 -0400 Subject: [PATCH 081/871] Update go to version v168 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 27cfefe7d..03de02af8 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v166 +v168 From 18f68dd2b7f9bd8d4232500019fc8aa865144cc2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:32 -0400 Subject: [PATCH 082/871] Update php to version v224 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 9723eb6a0..cc08b9dfa 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v223 +v224 From 452933c821684673c72e1ca4f66f0f8fc95aa92d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 01:18:33 -0400 Subject: [PATCH 083/871] Update static to version v17 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 6f7f377bf..703a257b8 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v16 +v17 From ffdee2036a77bb9b00fd548e255f39cbec957f20 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 31 Aug 2022 10:49:08 -0400 Subject: [PATCH 084/871] feat: add support for building a herokuish:22 image --- .circleci/config.yml | 5 +++++ .github/workflows/release.yml | 8 ++++++++ Makefile | 3 +++ README.md | 2 +- contrib/post-install | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 320b7805d..830f75c24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -43,6 +43,8 @@ jobs: docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest --build-arg STACK_VERSION=18 . - run: | docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 --build-arg STACK_VERSION=20 . + - run: | + docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 --build-arg STACK_VERSION=22 . - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 @@ -50,6 +52,9 @@ jobs: - run: | docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 + - run: | + docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 + docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 workflows: version: 2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4c8a50719..190da45fa 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,6 +36,9 @@ jobs: - 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 . + - name: Build herokuish-22 + run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 -t gliderlabs/herokuish:latest-22 --build-arg STACK_VERSION=22 . + - name: Push herokuish-18 run: | docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-18 @@ -46,3 +49,8 @@ jobs: run: | docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-20 docker image push gliderlabs/herokuish:latest-20 + + - name: Push herokuish-22 + run: | + docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 + docker image push gliderlabs/herokuish:latest-22 diff --git a/Makefile b/Makefile index 0cf90b375..931ae0576 100644 --- a/Makefile +++ b/Makefile @@ -56,10 +56,12 @@ build/docker: ifeq ($(CIRCLECI),true) docker build -t $(IMAGE_NAME):$(BUILD_TAG) . docker build -t $(IMAGE_NAME):$(BUILD_TAG)-20 --build-arg STACK_VERSION=20 . + docker build -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . 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 . + docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . endif build/deb: @@ -119,6 +121,7 @@ clean: deps: docker pull heroku/heroku:18-build docker pull heroku/heroku:20-build + docker pull heroku/heroku:22-build cd / && go get -u github.com/jteeuwen/go-bindata/... cd / && go get -u github.com/progrium/basht/... $(MAKE) bindata.go diff --git a/README.md b/README.md index 94c8fecbd..c1539846d 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A command line tool for emulating Heroku build and runtime tasks in containers. Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc. -The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:18 and Heroku:20 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. +The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:18, Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. Herokuish is a community project and is in no way affiliated with Heroku. diff --git a/contrib/post-install b/contrib/post-install index 6547d66e4..732439ca0 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -21,5 +21,7 @@ VERSION=$(cat /var/lib/herokuish/VERSION) sudo docker pull "gliderlabs/herokuish:v${VERSION}-18" sudo docker pull "gliderlabs/herokuish:v${VERSION}-20" +sudo docker pull "gliderlabs/herokuish:v${VERSION}-22" sudo docker tag "gliderlabs/herokuish:v${VERSION}-18" gliderlabs/herokuish:latest sudo docker tag "gliderlabs/herokuish:v${VERSION}-20" gliderlabs/herokuish:latest-20 +sudo docker tag "gliderlabs/herokuish:v${VERSION}-22" gliderlabs/herokuish:latest-22 From d51a9720b5c427b9224ca0c0861acc2151c494ef Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 10 Sep 2022 21:44:11 -0400 Subject: [PATCH 085/871] Update static to version v21 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 703a257b8..168943762 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v17 +v21 From acb7e8d717785ae5b7409b7a7209f38fbb696d77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Sep 2022 19:55:29 +0000 Subject: [PATCH 086/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.14.11 to 2.15.3. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/v2.15.3/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.14.11...v2.15.3) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index db0c83e27..3fe904cc8 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -579,16 +579,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "30885182c981ab175d4d034db0f6f469898070ab" + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab", - "reference": "30885182c981ab175d4d034db0f6f469898070ab", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", "shasum": "" }, "require": { @@ -603,7 +603,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -641,7 +641,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" }, "funding": [ { @@ -657,20 +657,20 @@ "type": "tidelift" } ], - "time": "2021-10-20T20:35:02+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825" + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825", - "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", "shasum": "" }, "require": { @@ -685,7 +685,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -724,7 +724,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" }, "funding": [ { @@ -740,7 +740,7 @@ "type": "tidelift" } ], - "time": "2021-11-30T18:21:41+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/polyfill-php56", @@ -880,16 +880,16 @@ }, { "name": "symfony/polyfill-php72", - "version": "v1.25.0", + "version": "v1.26.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976" + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/9a142215a36a3888e30d0a9eeea9766764e96976", - "reference": "9a142215a36a3888e30d0a9eeea9766764e96976", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", + "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", "shasum": "" }, "require": { @@ -898,7 +898,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.23-dev" + "dev-main": "1.26-dev" }, "thanks": { "name": "symfony/polyfill", @@ -936,7 +936,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.25.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" }, "funding": [ { @@ -952,7 +952,7 @@ "type": "tidelift" } ], - "time": "2021-05-27T09:17:38+00:00" + "time": "2022-05-24T11:49:31+00:00" }, { "name": "symfony/routing", @@ -1112,16 +1112,16 @@ }, { "name": "twig/twig", - "version": "v2.14.11", + "version": "v2.15.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727" + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/66baa66f29ee30e487e05f1679903e36eb01d727", - "reference": "66baa66f29ee30e487e05f1679903e36eb01d727", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", + "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", "shasum": "" }, "require": { @@ -1137,7 +1137,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.14-dev" + "dev-master": "2.15-dev" } }, "autoload": { @@ -1176,7 +1176,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.14.11" + "source": "https://github.com/twigphp/Twig/tree/v2.15.3" }, "funding": [ { @@ -1188,7 +1188,7 @@ "type": "tidelift" } ], - "time": "2022-02-04T06:57:25+00:00" + "time": "2022-09-28T08:40:08+00:00" } ], "packages-dev": [ @@ -1244,5 +1244,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.2.0" + "plugin-api-version": "2.3.0" } From f936e9f5ee5c98b6e96a9678026dc2fe36929530 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:43 -0400 Subject: [PATCH 087/871] Update python to version v222 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 975955610..96ed0f2af 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v218 +v222 From 5c582dd300406cadc7049ca4557122160cc4db93 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:43 -0400 Subject: [PATCH 088/871] Update nodejs to version v201 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index bc579f822..1b4c45cc4 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v198 +v201 From 71a319bbe70ed81211150689e833a9f779cc1310 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:44 -0400 Subject: [PATCH 089/871] Update scala to version v96 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index 4401de6eb..ae2994c2d 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v94 +v96 From b629f99a1f1e15c7ed2d3afa77e641c5ea5bc545 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:45 -0400 Subject: [PATCH 090/871] Update static to version v22 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 168943762..53d1c14db 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v21 +v22 From 431178cb56fb361985ce8d1bfa09a3fbdaf0c139 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 20:51:45 -0400 Subject: [PATCH 091/871] Update php to version v226 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index cc08b9dfa..3e1126dc8 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v224 +v226 From c715c6b923b7f0d4f549c23ef51082a8d779f7a1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 1 Nov 2022 21:32:02 -0400 Subject: [PATCH 092/871] Release 0.5.38 - @josegonzalez Add support for building a herokuish:22 image #792 - @josegonzalez Upgrade ruby version used in CI #793 - @josegonzalez Update go to version v168 #795 - @josegonzalez Update nodejs to version v201 #804 - @josegonzalez Update php to version v226 #803 - @josegonzalez Update python to version v222 #802 - @josegonzalez Update scala to version v96 #801 - @josegonzalez Update static to version v22 #800 - @josegonzalez chore(deps): bump twig/twig from 2.14.11 to 2.15.3 in /buildpacks/buildpack-php/tests/php #799 --- CHANGELOG.md | 12 ++++++++++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9a531c432..0d0e58809 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,18 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.38](https://github.com/gliderlabs/herokuish/compare/v0.5.37...v0.5.38) - 2021-11-01 + +- @josegonzalez Add support for building a herokuish:22 image #792 +- @josegonzalez Upgrade ruby version used in CI #793 +- @josegonzalez Update go to version v168 #795 +- @josegonzalez Update nodejs to version v201 #804 +- @josegonzalez Update php to version v226 #803 +- @josegonzalez Update python to version v222 #802 +- @josegonzalez Update scala to version v96 #801 +- @josegonzalez Update static to version v22 #800 +- @josegonzalez chore(deps): bump twig/twig from 2.14.11 to 2.15.3 in /buildpacks/buildpack-php/tests/php #799 + ## [0.5.37](https://github.com/gliderlabs/herokuish/compare/v0.5.36...v0.5.37) - 2021-08-07 ### Changed diff --git a/Dockerfile b/Dockerfile index 4af99674e..f42232ced 100644 --- 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.37/herokuish_0.5.37_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.38/herokuish_0.5.38_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index 931ae0576..2bc8c1e1d 100644 --- 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.37 +VERSION ?= 0.5.38 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index c1539846d..5f34cbe70 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.37-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.38-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.37/herokuish_0.5.37_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.38/herokuish_0.5.38_linux_x86_64.tgz \ | tar -xzC /bin ``` From 2f0d4a5247f6af1465d0d867d5b626ad0f29aa26 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 4 Nov 2022 14:33:04 -0400 Subject: [PATCH 093/871] Update nodejs to version v202 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 1b4c45cc4..2076b6e9d 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v201 +v202 From 60b70eaa8ec4572cf0d423f0f94c52a98186d0a0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 4 Nov 2022 14:33:06 -0400 Subject: [PATCH 094/871] Update php to version v227 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 3e1126dc8..edc8339f3 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v226 +v227 From 1c8491778d263cd9c4b6d59660dd34d26e20e3a4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 4 Nov 2022 14:53:23 -0400 Subject: [PATCH 095/871] Release 0.5.39 - @josegonzalez Update nodejs to version v202 #806 - @josegonzalez Update php to version v227 #807 --- CHANGELOG.md | 4 ++++ Dockerfile | 2 +- Makefile | 2 +- README.md | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d0e58809..471d402f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.39](https://github.com/gliderlabs/herokuish/compare/v0.5.38...v0.5.39) - 2021-11-04 + +- @josegonzalez Update nodejs to version v202 #806 +- @josegonzalez Update php to version v227 #807 ## [0.5.38](https://github.com/gliderlabs/herokuish/compare/v0.5.37...v0.5.38) - 2021-11-01 diff --git a/Dockerfile b/Dockerfile index f42232ced..b380deb90 100644 --- 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.38/herokuish_0.5.38_linux_x86_64.tgz" \ +RUN curl "https://github.com/gliderlabs/herokuish/releases/download/v0.5.39/herokuish_0.5.39_linux_x86_64.tgz" \ --silent -L | tar -xzC /bin RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ diff --git a/Makefile b/Makefile index 2bc8c1e1d..69196d435 100644 --- 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.38 +VERSION ?= 0.5.39 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 5f34cbe70..a85cfa4ca 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.38-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.39-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.38/herokuish_0.5.38_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.39/herokuish_0.5.39_linux_x86_64.tgz \ | tar -xzC /bin ``` From 3bde746d7d8651414dbebebf7e9a6eb3762ce665 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 9 Nov 2022 22:23:18 -0500 Subject: [PATCH 096/871] Update python to version v223 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 96ed0f2af..9723eb6a0 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v222 +v223 From 38957ca904391d8a1a4c4a4fab60a19eefe4aa49 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 9 Nov 2022 22:23:20 -0500 Subject: [PATCH 097/871] Update go to version v169 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 03de02af8..434725e40 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v168 +v169 From 4850c9e62dee6040c47790b81aff57938b5bc9d9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 9 Nov 2022 22:42:50 -0500 Subject: [PATCH 098/871] chore: drop unused Dockerfile I don't remember what this is for but it is no longer referenced and therefore can be removed. --- Dockerfile.build | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 Dockerfile.build diff --git a/Dockerfile.build b/Dockerfile.build deleted file mode 100644 index 87aaa770e..000000000 --- a/Dockerfile.build +++ /dev/null @@ -1,19 +0,0 @@ -FROM golang:1.17.8 - -ENV DEBIAN_FRONTEND noninteractive - -RUN apt-get update -qq \ - && apt-get install -qq -y --force-yes \ - apt-transport-https \ - apt-utils \ - ca-certificates \ - curl \ - gnupg2 \ - software-properties-common \ - && curl -fsSL https://download.docker.com/linux/$(. /etc/os-release; echo "$ID")/gpg | apt-key add - \ - && add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/$(. /etc/os-release; echo "$ID") $(lsb_release -cs) stable" -RUN apt-get update -qq \ - && apt-get install -qq -y --force-yes docker-ce=17.12.0~ce-0~debian - -WORKDIR /src From 25f5671e3323a19d930cbe1b2924d285e4472d0d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 10 Nov 2022 02:05:05 -0500 Subject: [PATCH 099/871] refactor: build images for arm/arm64 This change uses buildx to build images for arm and arm64. While it does not guarantee that buildpacks will work under those platforms, it does allow folks to specify custom buildpacks that will. --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 10 ++---- Dockerfile | 24 ++++++++++--- Makefile | 16 +++------ bin/setup.sh | 63 +++++++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 24 deletions(-) create mode 100755 bin/setup.sh diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a490aa01..723e1e03e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: run: make deps fpm package_cloud - name: build - run: CIRCLECI=true make build + run: make build - name: bash tests run: basht tests/**/tests.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 190da45fa..44cf09c59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -30,14 +30,8 @@ jobs: id: get_version 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 -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 . - - - name: Build herokuish-22 - run: docker image build -t gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 -t gliderlabs/herokuish:latest-22 --build-arg STACK_VERSION=22 . + - name: Build herokuish + run: make build/docker VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" - name: Push herokuish-18 run: | diff --git a/Dockerfile b/Dockerfile index b380deb90..61886ebca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,21 @@ +# syntax=docker/dockerfile:1 ARG STACK_VERSION=18 -FROM heroku/heroku:$STACK_VERSION-build -ARG STACK_VERSION + +FROM golang:1.17 AS builder +RUN mkdir /src +ADD . /src/ +WORKDIR /src + +ARG VERSION +RUN go build -a -ldflags "-X main.Version=$VERSION" -o herokuish . + +FROM ubuntu:${STACK_VERSION}.04 AS base +ARG STACK_VERSION=18 +ARG TARGETARCH + +ADD bin/setup.sh /tmp/setup.sh +RUN STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ + rm -rf /tmp/setup.sh ENV STACK=heroku-$STACK_VERSION ENV DEBIAN_FRONTEND noninteractive @@ -17,8 +32,9 @@ 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.39/herokuish_0.5.39_linux_x86_64.tgz" \ - --silent -L | tar -xzC /bin + +COPY --from=builder /src/herokuish /bin/ + RUN /bin/herokuish buildpack install \ && ln -s /bin/herokuish /build \ && ln -s /bin/herokuish /start \ diff --git a/Makefile b/Makefile index 69196d435..eea14368e 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go static null SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') +DOCKER_ARGS ?= "--pull" shellcheck: ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0) @@ -48,21 +49,14 @@ bindata.go: build: bindata.go mkdir -p build/linux && GOOS=linux go build -a -ldflags "-X main.Version=$(VERSION)" -o build/linux/$(NAME) mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version=$(VERSION)" -o build/darwin/$(NAME) - $(MAKE) build/docker $(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm $(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb build/docker: -ifeq ($(CIRCLECI),true) - docker build -t $(IMAGE_NAME):$(BUILD_TAG) . - docker build -t $(IMAGE_NAME):$(BUILD_TAG)-20 --build-arg STACK_VERSION=20 . - docker build -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . -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 . - docker build -f Dockerfile.dev -t $(IMAGE_NAME):$(BUILD_TAG)-22 --build-arg STACK_VERSION=22 . -endif + # --push + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . build/deb: mkdir -p build/deb diff --git a/bin/setup.sh b/bin/setup.sh new file mode 100755 index 000000000..13015a00e --- /dev/null +++ b/bin/setup.sh @@ -0,0 +1,63 @@ +#!/usr/bin/env bash +set -eo pipefail + +# install wget and certificates to get the scripts in place +apt-get update +apt-get install -y --no-install-recommends wget ca-certificates +rm -rf /root/* +rm -rf /tmp/* +rm -rf /var/cache/apt/archives/*.deb +rm -rf /var/lib/apt/lists/* + +# get heroku's stack scripts +setup_01="$(wget -qO- "https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh")" +setup_02="$(wget -qO- "https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh")" + +# cleanup ca-certificates +apt-get purge -y ca-certificates +apt-get autoremove -y --purge + +# write the first script +echo "$setup_01" > /tmp/setup-01.sh +chmod +x /tmp/setup-01.sh + +# Ensure we install from ports for arm/arm64 systems +# Skip unsupported syslinux +if [[ "$TARGETARCH" != "amd64" ]]; then + sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh + sed -i '/syslinux/d' /tmp/setup-01.sh +fi + +# Skip unsupported postgresql on arm:18 +if [[ "$TARGETARCH" == "arm" ]] && [[ "$STACK_VERSION" == "18" ]]; then + sed -i '/postgresql-client-14/d' /tmp/setup-01.sh +fi + +# from base image +/tmp/setup-01.sh + +# Install syslinux for amd64 only, mtools always +apt-get update +if [[ "$TARGETARCH" == "amd64" ]]; then + apt-get install -y --no-install-recommends syslinux +else + apt-get install -y --no-install-recommends mtools +fi +rm -rf /root/* +rm -rf /tmp/* +rm -rf /var/cache/apt/archives/*.deb +rm -rf /var/lib/apt/lists/* + +# write the second script +echo "$setup_02" > /tmp/setup-02.sh +chmod +x /tmp/setup-02.sh + +# Skip unsupported postgresql on arm:18 +if [[ "$TARGETARCH" == "arm" ]] && [[ "$STACK_VERSION" == "18" ]]; then + sed -i '/postgresql-server-dev-14/d' /tmp/setup-02.sh +fi + +# from build image +/tmp/setup-02.sh + +rm -rf /tmp/setup-01.sh /tmp/setup-02.sh From 444ef17cb19918557c2a269e06c81d0cad8ff103 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 21:52:49 -0500 Subject: [PATCH 100/871] fix: build image locally in tests in addition to buildx This has to be done so we can actually use the image in tests since there is no way to export an image with a multi-arch manifest for local usage. See docker/buildx#166 for more details. --- .github/workflows/main.yml | 4 +++- Makefile | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 723e1e03e..7ac84efbd 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -97,7 +97,9 @@ jobs: run: make deps - name: build docker images - run: make build/docker + run: | + make build/docker BUILDX=false + make build/docker - name: run buildpack test run: | diff --git a/Makefile b/Makefile index eea14368e..45c686b19 100644 --- a/Makefile +++ b/Makefile @@ -13,6 +13,7 @@ BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php g SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') DOCKER_ARGS ?= "--pull" +BUILDX ?= true shellcheck: ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0) @@ -53,10 +54,17 @@ build: bindata.go $(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb build/docker: +ifeq ($(BUILDX),true) # --push docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest . docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . +else + # --push + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest . + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . +endif build/deb: mkdir -p build/deb From a79da5a9b55876188024bf7831cb87ed23491def Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 22:03:02 -0500 Subject: [PATCH 101/871] fix: build the docker image locally here as well --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7ac84efbd..30d1d2eb9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -48,7 +48,7 @@ jobs: run: make deps fpm package_cloud - name: build - run: make build + run: make build build/docker BUILDX=false - name: bash tests run: basht tests/**/tests.sh From 67166fe51a0cebd90f06a66182c2b3e0a7a95eed Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 22:21:37 -0500 Subject: [PATCH 102/871] fix: respect the BUILD_TAG --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 45c686b19..a290fabf9 100644 --- a/Makefile +++ b/Makefile @@ -56,12 +56,12 @@ build: bindata.go build/docker: ifeq ($(BUILDX),true) # --push - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(BUILD_TAG) . docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . else # --push - docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest . + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(BUILD_TAG) . docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . endif From c4e7f6a888409615db788550651cfd40e0dcbceb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 22:28:45 -0500 Subject: [PATCH 103/871] refactor: get the scripts via docker's built in url retrieval functionality --- Dockerfile | 2 ++ bin/setup.sh | 16 ++-------------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 61886ebca..2d5429c77 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,8 @@ FROM ubuntu:${STACK_VERSION}.04 AS base ARG STACK_VERSION=18 ARG TARGETARCH +ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh +ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh /tmp/setup-02.sh ADD bin/setup.sh /tmp/setup.sh RUN STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ rm -rf /tmp/setup.sh diff --git a/bin/setup.sh b/bin/setup.sh index 13015a00e..a9e83497a 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -1,21 +1,9 @@ #!/usr/bin/env bash set -eo pipefail -# install wget and certificates to get the scripts in place -apt-get update -apt-get install -y --no-install-recommends wget ca-certificates -rm -rf /root/* -rm -rf /tmp/* -rm -rf /var/cache/apt/archives/*.deb -rm -rf /var/lib/apt/lists/* - # get heroku's stack scripts -setup_01="$(wget -qO- "https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh")" -setup_02="$(wget -qO- "https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh")" - -# cleanup ca-certificates -apt-get purge -y ca-certificates -apt-get autoremove -y --purge +setup_01="$(cat /tmp/setup-01.sh)" +setup_02="$(cat /tmp/setup-02.sh)" # write the first script echo "$setup_01" > /tmp/setup-01.sh From d87d64c194931449aff7db1ac9febe13a55fdc7a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 22:32:45 -0500 Subject: [PATCH 104/871] fix: drop unused Dockerfile.dev --- Dockerfile.dev | 38 -------------------------------------- Makefile | 1 - 2 files changed, 39 deletions(-) delete mode 100644 Dockerfile.dev diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index 9ba062150..000000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,38 +0,0 @@ -ARG STACK_VERSION=18 -FROM heroku/heroku:$STACK_VERSION-build -ARG STACK_VERSION - -ENV STACK=heroku-$STACK_VERSION -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 \ - --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/* -COPY ./build/linux/herokuish /bin/herokuish - -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 -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 a290fabf9..7d6409316 100644 --- a/Makefile +++ b/Makefile @@ -152,7 +152,6 @@ ci-report: which ruby ruby -v rm -f ~/.gitconfig - mv Dockerfile.dev Dockerfile lint: # SC2002: Useless cat - https://github.com/koalaman/shellcheck/wiki/SC2002 From 46117cd8fbc7483cf1e4aea0ee950ff740ca8c53 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 23:07:12 -0500 Subject: [PATCH 105/871] debug: run in trace mode --- bin/setup.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/setup.sh b/bin/setup.sh index a9e83497a..7cc64db59 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -1,5 +1,6 @@ #!/usr/bin/env bash set -eo pipefail +set -x # get heroku's stack scripts setup_01="$(cat /tmp/setup-01.sh)" From 5a17417e5b3f8c2124b26c16a9def3e3f74fa3e3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 23:21:48 -0500 Subject: [PATCH 106/871] fix: do not run if not executing multi-arch builds --- bin/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/setup.sh b/bin/setup.sh index 7cc64db59..67ccc9cdd 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -12,7 +12,7 @@ chmod +x /tmp/setup-01.sh # Ensure we install from ports for arm/arm64 systems # Skip unsupported syslinux -if [[ "$TARGETARCH" != "amd64" ]]; then +if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh sed -i '/syslinux/d' /tmp/setup-01.sh fi From 478fc8b4cb52c0c200626731866ea49960ff18fa Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 23:47:29 -0500 Subject: [PATCH 107/871] fix: do not build for all platforms again in ci --- .github/workflows/main.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 30d1d2eb9..c3f5dc6ff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -99,7 +99,6 @@ jobs: - name: build docker images run: | make build/docker BUILDX=false - make build/docker - name: run buildpack test run: | From 0e9598ad4fb8d17808b7ab6badfbf182c7565876 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 23:47:40 -0500 Subject: [PATCH 108/871] refactor: split out how stacks get built --- Makefile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index 7d6409316..bbcbbb207 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,7 @@ SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') DOCKER_ARGS ?= "--pull" BUILDX ?= true +STACK_VERSION ?= 18 shellcheck: ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0) @@ -54,16 +55,19 @@ build: bindata.go $(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb build/docker: + $(MAKE) build/docker/18 STACK_VERSION=18 + $(MAKE) build/docker/18 STACK_VERSION=20 + $(MAKE) build/docker/18 STACK_VERSION=22 + +build/docker/$(STACK_VERSION): ifeq ($(BUILDX),true) - # --push - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(BUILD_TAG) . - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . +ifeq ($(STACK_VERSION),18) + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . +else + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) . +endif else - # --push - docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):latest -t $(IMAGE_NAME):$(BUILD_TAG) . - docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=20 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-20 -t $(IMAGE_NAME):latest-20 . - docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=22 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-22 -t $(IMAGE_NAME):latest-22 . + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) . endif build/deb: From 0f4a1e8d30eeee751d9dcc26a0e844d823514a01 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 13 Nov 2022 23:51:28 -0500 Subject: [PATCH 109/871] fix: setup buildx --- .github/workflows/main.yml | 22 +++++++++++++++++++--- .github/workflows/release.yml | 28 +++++++++++++--------------- 2 files changed, 32 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c3f5dc6ff..88483b502 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -47,8 +47,25 @@ jobs: - name: install requirements run: make deps fpm package_cloud + - name: set up qemu + uses: docker/setup-qemu-action@v2 + + - name: set up docker buildx + id: buildx + uses: docker/setup-buildx-action@v2 + + - name: inspect builder + run: | + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" + - name: build - run: make build build/docker BUILDX=false + run: | + make build/docker + make build build/docker BUILDX=false - name: bash tests run: basht tests/**/tests.sh @@ -97,8 +114,7 @@ jobs: run: make deps - name: build docker images - run: | - make build/docker BUILDX=false + run: make build/docker BUILDX=false - name: run buildpack test run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 44cf09c59..72a0a1fcd 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,22 +29,20 @@ jobs: - name: Get the version id: get_version run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + - name: set up qemu + uses: docker/setup-qemu-action@v2 - - name: Build herokuish - run: make build/docker VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" - - - name: Push herokuish-18 - 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: set up docker buildx + id: buildx + uses: docker/setup-buildx-action@v2 - - name: Push herokuish-20 + - name: inspect builder run: | - docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-20 - docker image push gliderlabs/herokuish:latest-20 + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - - name: Push herokuish-22 - run: | - docker image push gliderlabs/herokuish:${{ steps.get_version.outputs.VERSION }}-22 - docker image push gliderlabs/herokuish:latest-22 + - name: Build herokuish + run: make build/docker VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" From 286b1ba4da89245fc20bd66f9094a3f2f8778a15 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 14 Nov 2022 01:32:04 -0500 Subject: [PATCH 110/871] fix: correct build versions --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bbcbbb207..3a450cac8 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,8 @@ build: bindata.go build/docker: $(MAKE) build/docker/18 STACK_VERSION=18 - $(MAKE) build/docker/18 STACK_VERSION=20 - $(MAKE) build/docker/18 STACK_VERSION=22 + $(MAKE) build/docker/20 STACK_VERSION=20 + $(MAKE) build/docker/22 STACK_VERSION=22 build/docker/$(STACK_VERSION): ifeq ($(BUILDX),true) From 56a519d3dfb39ca790fd3fea96c5bf61b394a36b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 15 Nov 2022 17:14:41 -0500 Subject: [PATCH 111/871] feat: change amd64 deb to all architectures --- Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 3a450cac8..57a3c66e9 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ build: bindata.go mkdir -p build/linux && GOOS=linux go build -a -ldflags "-X main.Version=$(VERSION)" -o build/linux/$(NAME) mkdir -p build/darwin && GOOS=darwin go build -a -ldflags "-X main.Version=$(VERSION)" -o build/darwin/$(NAME) $(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm - $(MAKE) build/deb/$(NAME)_$(VERSION)_amd64.deb + $(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb build/docker: $(MAKE) build/docker/18 STACK_VERSION=18 @@ -73,11 +73,11 @@ endif build/deb: mkdir -p build/deb -build/deb/$(NAME)_$(VERSION)_amd64.deb: build/deb +build/deb/$(NAME)_$(VERSION)_all.deb: build/deb echo $(VERSION) > /tmp/$(NAME)-VERSION fpm \ --after-install contrib/post-install \ - --architecture amd64 \ + --architecture all \ --category utils \ --deb-pre-depends 'docker-engine-cs (>= 1.13.0) | docker-engine (>= 1.13.0) | docker-io (>= 1.13.0) | docker.io (>= 1.13.0) | docker-ce (>= 1.13.0) | docker-ee (>= 1.13.0) | moby-engine' \ --deb-pre-depends sudo \ @@ -86,7 +86,7 @@ build/deb/$(NAME)_$(VERSION)_amd64.deb: build/deb --license 'MIT License' \ --name $(NAME) \ --output-type deb \ - --package build/deb/$(NAME)_$(VERSION)_amd64.deb \ + --package build/deb/$(NAME)_$(VERSION)_all.deb \ --url "https://github.com/gliderlabs/$(NAME)" \ --vendor "" \ --version $(VERSION) \ @@ -165,11 +165,11 @@ 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 bin/gh-release-body +release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_all.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 - cp build/deb/$(NAME)_$(VERSION)_amd64.deb release/$(NAME)_$(VERSION)_amd64.deb + cp build/deb/$(NAME)_$(VERSION)_all.deb release/$(NAME)_$(VERSION)_all.deb tar -zcf release/$(NAME)_$(VERSION)_linux_$(HARDWARE).tgz -C build/linux $(NAME) tar -zcf release/$(NAME)_$(VERSION)_darwin_$(HARDWARE).tgz -C build/darwin $(NAME) bin/gh-release create gliderlabs/$(NAME) $(VERSION) \ @@ -180,14 +180,14 @@ release-packagecloud: package_cloud @$(MAKE) release-packagecloud-deb @$(MAKE) release-packagecloud-rpm -release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/xenial build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_amd64.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_amd64.deb +release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/xenial build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb release-packagecloud-rpm: package_cloud build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm From 89ab11fc8c52610bdd6111c3df83586cbd94aa99 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 15 Nov 2022 22:15:48 -0500 Subject: [PATCH 112/871] Release 0.5.40 - @josegonzalez Update python to version v223 #809 - @josegonzalez Update go to version v169 #810 - @josegonzalez Add multi-arch support for herokuish #811 --- CHANGELOG.md | 7 +++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 471d402f0..ba741d675 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. + +## [0.5.40](https://github.com/gliderlabs/herokuish/compare/v0.5.39...v0.5.40) - 2021-11-15 + +- @josegonzalez Update python to version v223 #809 +- @josegonzalez Update go to version v169 #810 +- @josegonzalez Add multi-arch support for herokuish #811 + ## [0.5.39](https://github.com/gliderlabs/herokuish/compare/v0.5.38...v0.5.39) - 2021-11-04 - @josegonzalez Update nodejs to version v202 #806 diff --git a/Makefile b/Makefile index 57a3c66e9..c57de3c2a 100644 --- 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.39 +VERSION ?= 0.5.40 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index a85cfa4ca..ce88f6eac 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.39-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.40-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.39/herokuish_0.5.39_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.40/herokuish_0.5.40_linux_x86_64.tgz \ | tar -xzC /bin ``` From 560173a5f063c2b52c52d66914b6773d4f5f8fc9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 16 Nov 2022 15:20:55 -0500 Subject: [PATCH 113/871] fix: create bindata.go before building images --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c57de3c2a..0f5a4c6b7 100644 --- a/Makefile +++ b/Makefile @@ -54,7 +54,7 @@ build: bindata.go $(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm $(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb -build/docker: +build/docker: bindata.go $(MAKE) build/docker/18 STACK_VERSION=18 $(MAKE) build/docker/20 STACK_VERSION=20 $(MAKE) build/docker/22 STACK_VERSION=22 From 3b415035de94b229b4bc49a167f3b9a9ef8e0ec2 Mon Sep 17 00:00:00 2001 From: Henning Jensen Date: Thu, 17 Nov 2022 14:22:42 +0100 Subject: [PATCH 114/871] Don't fail in post-install when no dangling images are present --- contrib/post-install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/post-install b/contrib/post-install index 732439ca0..0b29ad6cd 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -7,10 +7,10 @@ if which systemctl > /dev/null; then fi echo "Pruning dangling images" -docker images -f dangling=true | awk '{print $3}' | xargs docker rmi || true +docker images -qf dangling=true | xargs docker rmi || true echo "Pruning unused gliderlabs/herokuish images" -docker images -a | grep "^gliderlabs\/herokuish" | grep -v latest | awk '{print $3}' | xargs docker rmi || true +docker images -a | grep "^gliderlabs\/herokuish" | grep -v latest | awk '{print $3}' | xargs -r docker rmi || true echo 'Importing herokuish into docker (around 5 minutes)' if [[ -n "$http_proxy" ]] || [[ -n "$https_proxy" ]]; then From 2037bcc709cdedb42c997b0f7e663cd70729f929 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 21 Nov 2022 00:37:25 -0500 Subject: [PATCH 115/871] Update ruby to version v245 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 1e48f7666..4eb4e4f09 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v244 +v245 From c6cf782afe7c0f07eed901fe568e1d3469dbd719 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 9 Jan 2023 15:22:58 -0500 Subject: [PATCH 116/871] Update ruby to version v250 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 4eb4e4f09..f7d62f0b3 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v245 +v250 From bc895f8ca861df3d8e62ff318d5aa393a436a40d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 9 Jan 2023 15:22:59 -0500 Subject: [PATCH 117/871] Update python to version v224 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 9723eb6a0..cc08b9dfa 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v223 +v224 From a1303d1e785eac59e3aef6abb1e6e8b833bfc8c0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 9 Jan 2023 15:22:59 -0500 Subject: [PATCH 118/871] Update gradle to version v39 --- buildpacks/buildpack-gradle/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-gradle/buildpack-version b/buildpacks/buildpack-gradle/buildpack-version index 3cac86345..f5dd48f0c 100644 --- a/buildpacks/buildpack-gradle/buildpack-version +++ b/buildpacks/buildpack-gradle/buildpack-version @@ -1 +1 @@ -v38 +v39 From 592da13c486ece4063d5622ce0b372870dbcef54 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 21 Nov 2022 00:36:07 -0500 Subject: [PATCH 119/871] fix: respect the STACK_VERSION and only set the latest/BUILD_TAG tag on heroku-18 --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 0f5a4c6b7..544cc7a3b 100644 --- a/Makefile +++ b/Makefile @@ -62,12 +62,12 @@ build/docker: bindata.go build/docker/$(STACK_VERSION): ifeq ($(BUILDX),true) ifeq ($(STACK_VERSION),18) - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . else - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . endif else - docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=18 --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-18 -t $(IMAGE_NAME):latest-18 -t $(IMAGE_NAME):$(BUILD_TAG) . + docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) . endif build/deb: From 743fcf6f7a56550281c0579d37a67ef6225a8190 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 21 Nov 2022 00:36:25 -0500 Subject: [PATCH 120/871] fix: add missing env vars during the release flow --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 72a0a1fcd..2780cc046 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -45,4 +45,4 @@ jobs: echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: Build herokuish - run: make build/docker VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" + run: make build/docker IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" From aae7df4f6aca84561e4421d40e6d57d4723b0001 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 21 Nov 2022 00:36:46 -0500 Subject: [PATCH 121/871] fix: drop postgres-client-14 for both arm:18 _and_ arm:20 --- bin/setup.sh | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/bin/setup.sh b/bin/setup.sh index 67ccc9cdd..0dd24df7b 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -17,9 +17,11 @@ if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then sed -i '/syslinux/d' /tmp/setup-01.sh fi -# Skip unsupported postgresql on arm:18 -if [[ "$TARGETARCH" == "arm" ]] && [[ "$STACK_VERSION" == "18" ]]; then - sed -i '/postgresql-client-14/d' /tmp/setup-01.sh +# Skip unsupported postgresql on arm:18 and arm:20 +if [[ "$TARGETARCH" == "arm" ]]; then + if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then + sed -i '/postgresql-client-14/d' /tmp/setup-01.sh + fi fi # from base image @@ -41,9 +43,11 @@ rm -rf /var/lib/apt/lists/* echo "$setup_02" > /tmp/setup-02.sh chmod +x /tmp/setup-02.sh -# Skip unsupported postgresql on arm:18 -if [[ "$TARGETARCH" == "arm" ]] && [[ "$STACK_VERSION" == "18" ]]; then - sed -i '/postgresql-server-dev-14/d' /tmp/setup-02.sh +# Skip unsupported postgresql on arm:18 and arm:20 +if [[ "$TARGETARCH" == "arm" ]]; then + if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then + sed -i '/postgresql-server-dev-14/d' /tmp/setup-02.sh + fi fi # from build image From 504ebde322ac401e9901383f8d67b9d4be92870f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:27:26 -0500 Subject: [PATCH 122/871] chore: upgrade to ruby 3.1.3 This fixes issues in tests as the old ruby version was only supported on heroku-18. --- buildpacks/buildpack-multi/tests/multi/.ruby-version | 1 + buildpacks/buildpack-multi/tests/multi/Gemfile | 2 +- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 6 ++++++ buildpacks/buildpack-ruby/tests/ruby-sinatra/.ruby-version | 2 +- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile | 2 +- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 5 ++++- 6 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 buildpacks/buildpack-multi/tests/multi/.ruby-version diff --git a/buildpacks/buildpack-multi/tests/multi/.ruby-version b/buildpacks/buildpack-multi/tests/multi/.ruby-version new file mode 100644 index 000000000..ff365e06b --- /dev/null +++ b/buildpacks/buildpack-multi/tests/multi/.ruby-version @@ -0,0 +1 @@ +3.1.3 diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile b/buildpacks/buildpack-multi/tests/multi/Gemfile index 625450211..451245b85 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile @@ -1,4 +1,4 @@ source 'http://rubygems.org' -ruby '2.6.1' +ruby '3.1.3' gem 'sinatra' gem 'rack' diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 317821f53..d0001dfb1 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -16,3 +16,9 @@ PLATFORMS DEPENDENCIES rack sinatra + +RUBY VERSION + ruby 3.1.3p185 + +BUNDLED WITH + 2.3.26 diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/.ruby-version b/buildpacks/buildpack-ruby/tests/ruby-sinatra/.ruby-version index 6a6a3d8e3..ff365e06b 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/.ruby-version +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/.ruby-version @@ -1 +1 @@ -2.6.1 +3.1.3 diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile index 223041604..639fa25e8 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile @@ -1,5 +1,5 @@ source 'http://rubygems.org' -ruby '2.6.6' +ruby '3.1.3' gem 'sinatra' gem 'rack' gem 'rake' diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 292237ea1..00f257395 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -26,5 +26,8 @@ DEPENDENCIES sinatra test-unit +RUBY VERSION + ruby 3.1.3p185 + BUNDLED WITH - 1.17.3 + 2.3.26 From b4ae6aa618aec92d876d0a8cc8b2a1c14fec798f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:32:45 -0500 Subject: [PATCH 123/871] fix: skip postgresql-15 This was updated upstream so we need to skip the correct version. --- bin/setup.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/setup.sh b/bin/setup.sh index 0dd24df7b..0b3bcc6fc 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -20,7 +20,7 @@ fi # Skip unsupported postgresql on arm:18 and arm:20 if [[ "$TARGETARCH" == "arm" ]]; then if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then - sed -i '/postgresql-client-14/d' /tmp/setup-01.sh + sed -i '/postgresql-client-15/d' /tmp/setup-01.sh fi fi @@ -46,7 +46,7 @@ chmod +x /tmp/setup-02.sh # Skip unsupported postgresql on arm:18 and arm:20 if [[ "$TARGETARCH" == "arm" ]]; then if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then - sed -i '/postgresql-server-dev-14/d' /tmp/setup-02.sh + sed -i '/postgresql-server-dev-15/d' /tmp/setup-02.sh fi fi From 6db2be5af39d27a1891ccd2875a7f8b1ce3bf85b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:43:11 -0500 Subject: [PATCH 124/871] refactor: ensure the bindata.go dependency is specified correctly in the Makefile --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 544cc7a3b..6bb8dbd02 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,12 @@ build: bindata.go $(MAKE) build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm $(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb -build/docker: bindata.go +build/docker: $(MAKE) build/docker/18 STACK_VERSION=18 $(MAKE) build/docker/20 STACK_VERSION=20 $(MAKE) build/docker/22 STACK_VERSION=22 -build/docker/$(STACK_VERSION): +build/docker/$(STACK_VERSION): bindata.go ifeq ($(BUILDX),true) ifeq ($(STACK_VERSION),18) docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . From 6ee6278f88f5ec1655628efb3a90e38fb8c1637b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:43:34 -0500 Subject: [PATCH 125/871] chore: drop unused key from workflow --- .github/workflows/release.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2780cc046..e16a5121b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,8 +11,6 @@ jobs: build: name: build runs-on: ubuntu-18.04 - strategy: - fail-fast: true steps: - uses: actions/checkout@v2 From aeb639c976ad89aa18fb8ddeaf19f77f3e6c8625 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:43:57 -0500 Subject: [PATCH 126/871] feat: add concurrency block to workflow to stop the workflow if there is a newer one on the same branch --- .github/workflows/main.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 88483b502..13bd18432 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -11,6 +11,10 @@ on: - master - 'release' +concurrency: + group: build-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + jobs: build: name: build From 62c42d25f29fefc1e1e5eaf8388ae33b486b7a6f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:44:37 -0500 Subject: [PATCH 127/871] tests: run unit tests against each version of the heroku stack we support --- .github/workflows/main.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 13bd18432..df8f50e38 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -82,7 +82,7 @@ jobs: unit-tests: - name: unit.${{ matrix.buildpack }} + name: unit.heroku-${{ matrix.heroku }}.${{ matrix.buildpack }} needs: build runs-on: ubuntu-18.04 strategy: @@ -102,6 +102,11 @@ jobs: - buildpack-ruby - buildpack-scala - buildpack-static + heroku: + - 18 + - 20 + - 22 + steps: - uses: actions/checkout@v2 @@ -118,7 +123,7 @@ jobs: run: make deps - name: build docker images - run: make build/docker BUILDX=false + run: make build/docker/${{ matrix.heroku }} BUILDX=false - name: run buildpack test run: | From 93c55a672cec44000efdf02b6e56867a8bc8bcd5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:45:10 -0500 Subject: [PATCH 128/871] tests: parallelize the build step --- .github/workflows/main.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index df8f50e38..a67d65b83 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,10 +17,18 @@ concurrency: jobs: build: - name: build + name: build.${{ matrix.make }} runs-on: ubuntu-18.04 strategy: fail-fast: true + matrix: + make: + - build/docker/18 + - build/docker/20 + - build/docker/22 + - build build/docker/18 BUILDX=false + - build build/docker/20 BUILDX=false + - build build/docker/22 BUILDX=false steps: - uses: actions/checkout@v2 @@ -67,9 +75,7 @@ jobs: echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: build - run: | - make build/docker - make build build/docker BUILDX=false + run: make ${{ matrix.make }} - name: bash tests run: basht tests/**/tests.sh From 6ff700c278038d0122ac332f6cca061137ee53ed Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 01:54:24 -0500 Subject: [PATCH 129/871] fix: set the STACK_VERSION --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a67d65b83..5faae602c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,12 +23,12 @@ jobs: fail-fast: true matrix: make: - - build/docker/18 - - build/docker/20 - - build/docker/22 - - build build/docker/18 BUILDX=false - - build build/docker/20 BUILDX=false - - build build/docker/22 BUILDX=false + - build/docker/18 STACK_VERSION=18 + - build/docker/20 STACK_VERSION=20 + - build/docker/22 STACK_VERSION=22 + - build build/docker/18 BUILDX=false STACK_VERSION=18 + - build build/docker/20 BUILDX=false STACK_VERSION=20 + - build build/docker/22 BUILDX=false STACK_VERSION=22 steps: - uses: actions/checkout@v2 @@ -129,7 +129,7 @@ jobs: run: make deps - name: build docker images - run: make build/docker/${{ matrix.heroku }} BUILDX=false + run: make build/docker/${{ matrix.heroku }} BUILDX=false STACK_VERSION=${{ matrix.heroku }} - name: run buildpack test run: | From 0dabfe570cf258811815681c0e1c3ebb2c9220ab Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 02:37:29 -0500 Subject: [PATCH 130/871] fix: drop postgres libraries from all arm installs Postgres 15 isn't available in heroku-22. --- bin/setup.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/bin/setup.sh b/bin/setup.sh index 0b3bcc6fc..cc9e21bc9 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -19,9 +19,7 @@ fi # Skip unsupported postgresql on arm:18 and arm:20 if [[ "$TARGETARCH" == "arm" ]]; then - if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then - sed -i '/postgresql-client-15/d' /tmp/setup-01.sh - fi + sed -i '/postgresql-client-15/d' /tmp/setup-01.sh fi # from base image @@ -45,9 +43,7 @@ chmod +x /tmp/setup-02.sh # Skip unsupported postgresql on arm:18 and arm:20 if [[ "$TARGETARCH" == "arm" ]]; then - if [[ "$STACK_VERSION" == "18" ]] || [[ "$STACK_VERSION" == "20" ]]; then - sed -i '/postgresql-server-dev-15/d' /tmp/setup-02.sh - fi + sed -i '/postgresql-server-dev-15/d' /tmp/setup-02.sh fi # from build image From 3606b3daf3be558c73bcd429b0d5581b2399e806 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 03:19:30 -0500 Subject: [PATCH 131/871] fix: load the built image into the local docker context --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5faae602c..7468ace55 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,9 @@ jobs: fail-fast: true matrix: make: - - build/docker/18 STACK_VERSION=18 - - build/docker/20 STACK_VERSION=20 - - build/docker/22 STACK_VERSION=22 + - build/docker/18 STACK_VERSION=18 DOCKER_ARGS="--load" + - build/docker/20 STACK_VERSION=20 DOCKER_ARGS="--load" + - build/docker/22 STACK_VERSION=22 DOCKER_ARGS="--load" - build build/docker/18 BUILDX=false STACK_VERSION=18 - build build/docker/20 BUILDX=false STACK_VERSION=20 - build build/docker/22 BUILDX=false STACK_VERSION=22 From 06efaeb7ad71918b4d776f3e22c008358ea5adc5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 03:47:25 -0500 Subject: [PATCH 132/871] fix: only run bash tests against the non-buildx version Due to missing functionality - see https://github.com/docker/roadmap/issues/371 for more details - we can't use --load to get access to the image in the local docker context. Instead, lets just skip the tests since we are already running them against the non-buildx version. --- .github/workflows/main.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7468ace55..e2170cfce 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -23,9 +23,9 @@ jobs: fail-fast: true matrix: make: - - build/docker/18 STACK_VERSION=18 DOCKER_ARGS="--load" - - build/docker/20 STACK_VERSION=20 DOCKER_ARGS="--load" - - build/docker/22 STACK_VERSION=22 DOCKER_ARGS="--load" + - build/docker/18 STACK_VERSION=18 + - build/docker/20 STACK_VERSION=20 + - build/docker/22 STACK_VERSION=22 - build build/docker/18 BUILDX=false STACK_VERSION=18 - build build/docker/20 BUILDX=false STACK_VERSION=20 - build build/docker/22 BUILDX=false STACK_VERSION=22 @@ -78,7 +78,10 @@ jobs: run: make ${{ matrix.make }} - name: bash tests - run: basht tests/**/tests.sh + run: | + if [[ "${{ matrix.make }}" ~= *BUILDX* ]]; then + basht tests/**/tests.sh + fi - name: upload packages uses: actions/upload-artifact@v2 From f7037083edbd0e158f1100c887547badd02d94f1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 03:55:21 -0500 Subject: [PATCH 133/871] fix: use correct regex check --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index e2170cfce..c1e55232d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -79,7 +79,7 @@ jobs: - name: bash tests run: | - if [[ "${{ matrix.make }}" ~= *BUILDX* ]]; then + if [[ "${{ matrix.make }}" =~ *BUILDX* ]]; then basht tests/**/tests.sh fi From 65a4888ecb7ba305ca2ac13f8bd112810f962ca3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 04:47:03 -0500 Subject: [PATCH 134/871] fix: update rake --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 00f257395..58b9e948b 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -7,7 +7,7 @@ GEM rack rack-test (0.6.3) rack (>= 1.0) - rake (12.3.3) + rake (13.0.6) sinatra (1.4.2) rack (~> 1.5, >= 1.5.2) rack-protection (~> 1.4) From 35d85fb1f6c0a31c10e5c1f96a2206dcededf975 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 05:32:29 -0500 Subject: [PATCH 135/871] chore: upgrade test-unit The old version seems to be having issues with ruby 3.1.x, so attempting an update to see if that fixes things. --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 58b9e948b..3c9525c70 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - power_assert (0.2.6) + power_assert (2.0.3) rack (1.6.12) rack-protection (1.5.0) rack @@ -12,7 +12,7 @@ GEM rack (~> 1.5, >= 1.5.2) rack-protection (~> 1.4) tilt (~> 1.3, >= 1.3.4) - test-unit (3.1.5) + test-unit (3.5.7) power_assert tilt (1.3.6) From 237753d91d0b38f1dc3dc74369484f03f38ef5dd Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 06:10:11 -0500 Subject: [PATCH 136/871] chore: update all primary dependencies --- .../tests/ruby-sinatra/Gemfile.lock | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 3c9525c70..c51441a46 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -1,20 +1,24 @@ GEM remote: http://rubygems.org/ specs: + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) power_assert (2.0.3) - rack (1.6.12) - rack-protection (1.5.0) + rack (2.2.6.2) + rack-protection (3.0.5) rack rack-test (0.6.3) rack (>= 1.0) rake (13.0.6) - sinatra (1.4.2) - rack (~> 1.5, >= 1.5.2) - rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) + ruby2_keywords (0.0.5) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) + tilt (~> 2.0) test-unit (3.5.7) power_assert - tilt (1.3.6) + tilt (2.0.11) PLATFORMS ruby From c18a1f9ee77b4971afd58c33976391b0a1ec212f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 9 Feb 2023 13:23:12 -0500 Subject: [PATCH 137/871] fix: install puma so sinatra starts properly --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile | 1 + buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile index 639fa25e8..71b30423b 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile @@ -1,6 +1,7 @@ source 'http://rubygems.org' ruby '3.1.3' gem 'sinatra' +gem 'puma' gem 'rack' gem 'rake' diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index c51441a46..5f67ebfa5 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -3,7 +3,10 @@ GEM specs: mustermann (3.0.0) ruby2_keywords (~> 0.0.1) + nio4r (2.5.8) power_assert (2.0.3) + puma (6.0.2) + nio4r (~> 2.0) rack (2.2.6.2) rack-protection (3.0.5) rack @@ -24,6 +27,7 @@ PLATFORMS ruby DEPENDENCIES + puma rack rack-test rake From d62467ea4c4dee8c3fc84b1596ea8bcb28f0e045 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Thu, 9 Feb 2023 14:29:34 -0500 Subject: [PATCH 138/871] feat: parallelize releases --- .github/workflows/release.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e16a5121b..cfab18d54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,13 @@ jobs: build: name: build runs-on: ubuntu-18.04 + strategy: + fail-fast: false + matrix: + heroku: + - 18 + - 20 + - 22 steps: - uses: actions/checkout@v2 @@ -43,4 +50,4 @@ jobs: echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: Build herokuish - run: make build/docker IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" + run: make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" From df3b1093dc17a7dd9156d7143e881bee97b7c042 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Wed, 8 Feb 2023 04:32:46 -0500 Subject: [PATCH 139/871] chore: update github workflows to use latest builder --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1e55232d..42c239ee5 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -18,7 +18,7 @@ concurrency: jobs: build: name: build.${{ matrix.make }} - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: true matrix: @@ -93,7 +93,7 @@ jobs: unit-tests: name: unit.heroku-${{ matrix.heroku }}.${{ matrix.buildpack }} needs: build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: @@ -142,7 +142,7 @@ jobs: release: name: release needs: unit-tests - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 From 68d609b1b2a80ed443708c0f864f88f5539c6456 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Wed, 8 Feb 2023 04:33:16 -0500 Subject: [PATCH 140/871] chore: update docker workflow to use latest builder --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cfab18d54..978a83793 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ on: jobs: build: name: build - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 strategy: fail-fast: false matrix: From 8c3c9a85dcbf500028c32ea846cc996cb7c0fe8e Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Wed, 8 Feb 2023 04:38:09 -0500 Subject: [PATCH 141/871] fix: add more ignores --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6bb8dbd02..4f6e54f63 100644 --- a/Makefile +++ b/Makefile @@ -162,8 +162,12 @@ lint: # SC2030: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2030 # SC2031: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2031 # SC2034: VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034 + # SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a. + # SC2001: See if you can use ${variable//search/replace} instead. + # SC2231: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt . + # SC2230: which is non-standard. Use builtin 'command -v' instead. @echo linting... - shellcheck -e SC2002,SC2030,SC2031,SC2034 -s bash include/*.bash tests/**/tests.sh + shellcheck -e SC2002,SC2030,SC2031,SC2034,SC2206,SC2001,SC2231,SC2230 -s bash include/*.bash tests/**/tests.sh release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_all.deb bin/gh-release bin/gh-release-body chmod +x build/linux/$(NAME) build/darwin/$(NAME) From 7f47980f9d8c1140ee144a89050548d8f883163c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 7 Feb 2023 16:46:23 -0500 Subject: [PATCH 142/871] Update go to version v171 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 434725e40..a567027ae 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v169 +v171 From ed7cb3e5ee7e18e1719240e2e505e0b3245ffcb6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 7 Feb 2023 16:46:22 -0500 Subject: [PATCH 143/871] Update php to version v230 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index edc8339f3..c2800375c 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v227 +v230 From 7daf4b0bada4fbed252d5ffefa9418f61491929e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 7 Feb 2023 16:46:19 -0500 Subject: [PATCH 144/871] Update ruby to version v251 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index f7d62f0b3..25953a18d 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v250 +v251 From 787f4ffbb29644349a4f408c8618b52150e9b301 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Thu, 9 Feb 2023 14:40:46 -0500 Subject: [PATCH 145/871] feat: create dependabot.yml --- .github/dependabot.yml | 68 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 000000000..d0cade59f --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,68 @@ +--- +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: "docker" + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: gomod + directory: "/" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: gomod + directory: "/buildpacks/buildpack-go/tests/go" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: maven + directory: "/buildpacks/buildpack-java/tests/java-jetty" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: npm + directory: "/buildpacks/buildpack-multi/tests/multi" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: bundler + directory: "/buildpacks/buildpack-multi/tests/multi" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: pip + directory: "/buildpacks/buildpack-multi/tests/multi" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: npm + directory: "/buildpacks/buildpack-nodejs/tests/nodejs-express" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: composer + directory: "/buildpacks/buildpack-php/tests/php" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: pip + directory: "/buildpacks/buildpack-python/tests/python-django" + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: pip + directory: "/buildpacks/buildpack-python/tests/python-flask + schedule: + interval: daily + open-pull-requests-limit: 10 + - package-ecosystem: bundler + directory: "/buildpacks/buildpack-ruby/tests/ruby-sinatra" + schedule: + interval: daily + open-pull-requests-limit: 10 From b528b6e90ee79bb177e8e14f633a93ff86b2bb5d Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Thu, 9 Feb 2023 14:49:45 -0500 Subject: [PATCH 146/871] Update dependabot.yml --- .github/dependabot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index d0cade59f..c1652e930 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -57,7 +57,7 @@ updates: interval: daily open-pull-requests-limit: 10 - package-ecosystem: pip - directory: "/buildpacks/buildpack-python/tests/python-flask + directory: "/buildpacks/buildpack-python/tests/python-flask" schedule: interval: daily open-pull-requests-limit: 10 From cba4b978c3d86806924c78d98156fd0682eb172f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:10 +0000 Subject: [PATCH 147/871] chore(deps): bump maven-compiler-plugin Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 2.3.2 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-2.3.2...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index 4b92d425d..d37032433 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -34,7 +34,7 @@ maven-compiler-plugin - 2.3.2 + 3.10.1 1.6 1.6 From 0caadb6e13b0cd817e1792476925ea4c95a744ec Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:12 +0000 Subject: [PATCH 148/871] chore(deps): bump gopkg.in/yaml.v2 from 2.2.8 to 2.4.0 Bumps [gopkg.in/yaml.v2](https://github.com/go-yaml/yaml) from 2.2.8 to 2.4.0. - [Release notes](https://github.com/go-yaml/yaml/releases) - [Commits](https://github.com/go-yaml/yaml/compare/v2.2.8...v2.4.0) --- updated-dependencies: - dependency-name: gopkg.in/yaml.v2 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- go.mod | 7 +++++-- go.sum | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d25e6807d..ed6fc5419 100644 --- a/go.mod +++ b/go.mod @@ -2,9 +2,12 @@ module herokuish go 1.17 +require ( + github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 + gopkg.in/yaml.v2 v2.4.0 +) + require ( github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 // indirect github.com/mitchellh/go-homedir v1.1.0 // indirect - github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 - gopkg.in/yaml.v2 v2.2.8 ) diff --git a/go.sum b/go.sum index 9bc67629a..09b5eda76 100644 --- a/go.sum +++ b/go.sum @@ -6,5 +6,5 @@ github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 h1:pNf4kIAZbE5u github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= From f2f7398dd21c9f78037d482633cac29988ed78e8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:13 +0000 Subject: [PATCH 149/871] chore(deps): bump maven-dependency-plugin Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 2.4 to 3.5.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-2.4...maven-dependency-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index 4b92d425d..fd9b45186 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 2.4 + 3.5.0 copy-dependencies From c20ffe3359ab2bdc58c4f81a458cfd6dc7b7f6d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:14 +0000 Subject: [PATCH 150/871] chore(deps): bump express Bumps [express](https://github.com/expressjs/express) from 3.1.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/3.1.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-nodejs/tests/nodejs-express/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json b/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json index 7d12aaf07..aa8f47a5c 100644 --- a/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json +++ b/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json @@ -5,6 +5,6 @@ "node": "8.11.2" }, "dependencies": { - "express": "3.1.x" + "express": "4.18.x" } } From 589fb4fd60a686f3ab6e47a1d3ac30c52cc4ed0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:15 +0000 Subject: [PATCH 151/871] chore(deps): bump express in /buildpacks/buildpack-multi/tests/multi Bumps [express](https://github.com/expressjs/express) from 3.1.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/3.1.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/package.json b/buildpacks/buildpack-multi/tests/multi/package.json index 7d12aaf07..aa8f47a5c 100644 --- a/buildpacks/buildpack-multi/tests/multi/package.json +++ b/buildpacks/buildpack-multi/tests/multi/package.json @@ -5,6 +5,6 @@ "node": "8.11.2" }, "dependencies": { - "express": "3.1.x" + "express": "4.18.x" } } From afca8ae36053e4ff89d7ad70bda19203c7d051ed Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:21 +0000 Subject: [PATCH 152/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 19.5.0 to 20.1.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/19.5.0...20.1.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index e5c54d7a6..49344bc07 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ Django==2.2.28 -gunicorn==19.5.0 +gunicorn==20.1.0 From 0f657e6293a4f6dd473c85faff1ed7e0698cacc1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:28 +0000 Subject: [PATCH 153/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 1.1.4 to 2.2.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/1.1.4...2.2.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 5eb1826f1..0f1310243 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==1.1.4 +Flask==2.2.2 Jinja2==2.11.3 gunicorn==19.5.0 markupsafe==2.0.1 From 4dc2b5432a9020a706584ce1f6c12407f6fbdfb6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:29 +0000 Subject: [PATCH 154/871] chore(deps): bump silex/silex in /buildpacks/buildpack-php/tests/php Bumps [silex/silex](https://github.com/silexphp/Silex) from 2.0.4 to 2.3.0. - [Release notes](https://github.com/silexphp/Silex/releases) - [Changelog](https://github.com/silexphp/Silex/blob/master/doc/changelog.rst) - [Commits](https://github.com/silexphp/Silex/compare/v2.0.4...v2.3.0) --- updated-dependencies: - dependency-name: silex/silex dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 1245 +++++++++++++---- 1 file changed, 1000 insertions(+), 245 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 3fe904cc8..0d6917964 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -86,25 +86,29 @@ }, { "name": "pimple/pimple", - "version": "v3.0.2", + "version": "v3.5.0", "source": { "type": "git", "url": "https://github.com/silexphp/Pimple.git", - "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a" + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a30f7d6e57565a2e1a316e1baf2a483f788b258a", - "reference": "a30f7d6e57565a2e1a316e1baf2a483f788b258a", + "url": "https://api.github.com/repos/silexphp/Pimple/zipball/a94b3a4db7fb774b3d78dad2315ddc07629e1bed", + "reference": "a94b3a4db7fb774b3d78dad2315ddc07629e1bed", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=7.2.5", + "psr/container": "^1.1 || ^2.0" + }, + "require-dev": { + "symfony/phpunit-bridge": "^5.4@dev" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "3.4.x-dev" } }, "autoload": { @@ -123,12 +127,68 @@ } ], "description": "Pimple, a simple Dependency Injection Container", - "homepage": "http://pimple.sensiolabs.org", + "homepage": "https://pimple.symfony.com", "keywords": [ "container", "dependency injection" ], - "time": "2015-09-11T15:10:35+00:00" + "support": { + "source": "https://github.com/silexphp/Pimple/tree/v3.5.0" + }, + "time": "2021-10-28T11:13:42+00:00" + }, + { + "name": "psr/container", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963", + "shasum": "" + }, + "require": { + "php": ">=7.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/2.0.2" + }, + "time": "2021-11-05T16:47:00+00:00" }, { "name": "psr/log", @@ -182,61 +242,62 @@ }, { "name": "silex/silex", - "version": "v2.0.4", + "version": "v2.3.0", "source": { "type": "git", "url": "https://github.com/silexphp/Silex.git", - "reference": "49ca08d853731d1635374e5019c8696cfd53c161" + "reference": "6bc31c1b8c4ef614a7115320fd2d3b958032f131" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/silexphp/Silex/zipball/49ca08d853731d1635374e5019c8696cfd53c161", - "reference": "49ca08d853731d1635374e5019c8696cfd53c161", + "url": "https://api.github.com/repos/silexphp/Silex/zipball/6bc31c1b8c4ef614a7115320fd2d3b958032f131", + "reference": "6bc31c1b8c4ef614a7115320fd2d3b958032f131", "shasum": "" }, "require": { - "php": ">=5.5.9", - "pimple/pimple": "~3.0", - "symfony/event-dispatcher": "~2.8|^3.0", - "symfony/http-foundation": "~2.8|^3.0", - "symfony/http-kernel": "~2.8|^3.0", - "symfony/routing": "~2.8|^3.0" + "php": ">=7.1.3", + "pimple/pimple": "^3.0", + "symfony/event-dispatcher": "^4.0", + "symfony/http-foundation": "^4.0", + "symfony/http-kernel": "^4.0", + "symfony/routing": "^4.0" }, "replace": { "silex/api": "self.version", "silex/providers": "self.version" }, "require-dev": { - "doctrine/dbal": "~2.2", + "doctrine/dbal": "^2.2", "monolog/monolog": "^1.4.1", - "swiftmailer/swiftmailer": "~5", - "symfony/asset": "~2.8|^3.0", - "symfony/browser-kit": "~2.8|^3.0", - "symfony/config": "~2.8|^3.0", - "symfony/css-selector": "~2.8|^3.0", - "symfony/debug": "~2.8|^3.0", - "symfony/doctrine-bridge": "~2.8|^3.0", - "symfony/dom-crawler": "~2.8|^3.0", - "symfony/expression-language": "~2.8|^3.0", - "symfony/finder": "~2.8|^3.0", - "symfony/form": "~2.8|^3.0", - "symfony/intl": "~2.8|^3.0", - "symfony/monolog-bridge": "~2.8|^3.0", - "symfony/options-resolver": "~2.8|^3.0", - "symfony/phpunit-bridge": "~2.8|^3.0", - "symfony/process": "~2.8|^3.0", - "symfony/security": "~2.8|^3.0", - "symfony/serializer": "~2.8|^3.0", - "symfony/translation": "~2.8|^3.0", - "symfony/twig-bridge": "~2.8|^3.0", - "symfony/validator": "~2.8|^3.0", - "symfony/var-dumper": "~2.8|^3.0", - "twig/twig": "~1.27|~2.0" + "swiftmailer/swiftmailer": "^5", + "symfony/asset": "^4.0", + "symfony/browser-kit": "^4.0", + "symfony/config": "^4.0", + "symfony/css-selector": "^4.0", + "symfony/debug": "^4.0", + "symfony/doctrine-bridge": "^4.0", + "symfony/dom-crawler": "^4.0", + "symfony/expression-language": "^4.0", + "symfony/finder": "^4.0", + "symfony/form": "^4.0", + "symfony/intl": "^4.0", + "symfony/monolog-bridge": "^4.0", + "symfony/options-resolver": "^4.0", + "symfony/phpunit-bridge": "^3.2", + "symfony/process": "^4.0", + "symfony/security": "^4.0", + "symfony/serializer": "^4.0", + "symfony/translation": "^4.0", + "symfony/twig-bridge": "^4.0", + "symfony/validator": "^4.0", + "symfony/var-dumper": "^4.0", + "symfony/web-link": "^4.0", + "twig/twig": "^2.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "2.3.x-dev" } }, "autoload": { @@ -254,45 +315,599 @@ "email": "fabien@symfony.com" }, { - "name": "Igor Wiedler", - "email": "igor@wiedler.ch" + "name": "Igor Wiedler", + "email": "igor@wiedler.ch" + } + ], + "description": "The PHP micro-framework based on the Symfony Components", + "homepage": "http://silex.sensiolabs.org", + "keywords": [ + "microframework" + ], + "support": { + "issues": "https://github.com/silexphp/Silex/issues", + "source": "https://github.com/silexphp/Silex/tree/v2.3.0" + }, + "abandoned": "symfony/flex", + "time": "2018-04-20T05:17:01+00:00" + }, + { + "name": "symfony/debug", + "version": "v4.4.44", + "source": { + "type": "git", + "url": "https://github.com/symfony/debug.git", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/debug/zipball/1a692492190773c5310bc7877cb590c04c2f05be", + "reference": "1a692492190773c5310bc7877cb590c04c2f05be", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/log": "^1|^2|^3" + }, + "conflict": { + "symfony/http-kernel": "<3.4" + }, + "require-dev": { + "symfony/http-kernel": "^3.4|^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\Debug\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/debug/tree/v4.4.44" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "abandoned": "symfony/error-handler", + "time": "2022-07-28T16:29:46+00:00" + }, + { + "name": "symfony/deprecation-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/deprecation-contracts.git", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "files": [ + "function.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "A generic function and convention to trigger deprecation notices", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:53:40+00:00" + }, + { + "name": "symfony/error-handler", + "version": "v4.4.44", + "source": { + "type": "git", + "url": "https://github.com/symfony/error-handler.git", + "reference": "be731658121ef2d8be88f3a1ec938148a9237291" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/error-handler/zipball/be731658121ef2d8be88f3a1ec938148a9237291", + "reference": "be731658121ef2d8be88f3a1ec938148a9237291", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "psr/log": "^1|^2|^3", + "symfony/debug": "^4.4.5", + "symfony/var-dumper": "^4.4|^5.0" + }, + "require-dev": { + "symfony/http-kernel": "^4.4|^5.0", + "symfony/serializer": "^4.4|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\ErrorHandler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools to manage errors and ease debugging PHP code", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/error-handler/tree/v4.4.44" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-28T16:29:46+00:00" + }, + { + "name": "symfony/event-dispatcher", + "version": "v4.4.44", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "reference": "1e866e9e5c1b22168e0ce5f0b467f19bba61266a", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "symfony/event-dispatcher-contracts": "^1.1", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "symfony/dependency-injection": "<3.4" + }, + "provide": { + "psr/event-dispatcher-implementation": "1.0", + "symfony/event-dispatcher-implementation": "1.1" + }, + "require-dev": { + "psr/log": "^1|^2|^3", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/error-handler": "~3.4|~4.4", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1|^2", + "symfony/stopwatch": "^3.4|^4.0|^5.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/event-dispatcher/tree/v4.4.44" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-20T09:59:04+00:00" + }, + { + "name": "symfony/event-dispatcher-contracts", + "version": "v1.1.13", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher-contracts.git", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/1d5cd762abaa6b2a4169d3e77610193a7157129e", + "reference": "1d5cd762abaa6b2a4169d3e77610193a7157129e", + "shasum": "" + }, + "require": { + "php": ">=7.1.3" + }, + "suggest": { + "psr/event-dispatcher": "", + "symfony/event-dispatcher-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.1-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\EventDispatcher\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to dispatching event", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v1.1.13" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-01-02T09:41:36+00:00" + }, + { + "name": "symfony/http-client-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-client-contracts.git", + "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-client-contracts/zipball/ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70", + "reference": "ba6a9f0e8f3edd190520ee3b9a958596b6ca2e70", + "shasum": "" + }, + "require": { + "php": ">=7.2.5" + }, + "suggest": { + "symfony/http-client-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\HttpClient\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to HTTP clients", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/http-client-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-04-12T15:48:08+00:00" + }, + { + "name": "symfony/http-foundation", + "version": "v4.4.49", + "source": { + "type": "git", + "url": "https://github.com/symfony/http-foundation.git", + "reference": "191413c7b832c015bb38eae963f2e57498c3c173" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/http-foundation/zipball/191413c7b832c015bb38eae963f2e57498c3c173", + "reference": "191413c7b832c015bb38eae963f2e57498c3c173", + "shasum": "" + }, + "require": { + "php": ">=7.1.3", + "symfony/mime": "^4.3|^5.0", + "symfony/polyfill-mbstring": "~1.1", + "symfony/polyfill-php80": "^1.16" + }, + "require-dev": { + "predis/predis": "~1.0", + "symfony/expression-language": "^3.4|^4.0|^5.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Symfony\\Component\\HttpFoundation\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Defines an object-oriented layer for the HTTP specification", + "homepage": "https://symfony.com", + "support": { + "source": "https://github.com/symfony/http-foundation/tree/v4.4.49" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" } ], - "description": "The PHP micro-framework based on the Symfony Components", - "homepage": "http://silex.sensiolabs.org", - "keywords": [ - "microframework" - ], - "time": "2016-11-06T18:09:06+00:00" + "time": "2022-11-04T16:17:57+00:00" }, { - "name": "symfony/debug", - "version": "v4.4.37", + "name": "symfony/http-kernel", + "version": "v4.4.50", "source": { "type": "git", - "url": "https://github.com/symfony/debug.git", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470" + "url": "https://github.com/symfony/http-kernel.git", + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/5de6c6e7f52b364840e53851c126be4d71e60470", - "reference": "5de6c6e7f52b364840e53851c126be4d71e60470", + "url": "https://api.github.com/repos/symfony/http-kernel/zipball/aa6df6c045f034aa13ac752fc234bb300b9488ef", + "reference": "aa6df6c045f034aa13ac752fc234bb300b9488ef", "shasum": "" }, "require": { "php": ">=7.1.3", - "psr/log": "^1|^2|^3" + "psr/log": "^1|^2", + "symfony/error-handler": "^4.4", + "symfony/event-dispatcher": "^4.4", + "symfony/http-client-contracts": "^1.1|^2", + "symfony/http-foundation": "^4.4.30|^5.3.7", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-php73": "^1.9", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "symfony/http-kernel": "<3.4" + "symfony/browser-kit": "<4.3", + "symfony/config": "<3.4", + "symfony/console": ">=5", + "symfony/dependency-injection": "<4.3", + "symfony/translation": "<4.2", + "twig/twig": "<1.43|<2.13,>=2" + }, + "provide": { + "psr/log-implementation": "1.0|2.0" }, "require-dev": { - "symfony/http-kernel": "^3.4|^4.0|^5.0" + "psr/cache": "^1.0|^2.0|^3.0", + "symfony/browser-kit": "^4.3|^5.0", + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0", + "symfony/css-selector": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^4.3|^5.0", + "symfony/dom-crawler": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/finder": "^3.4|^4.0|^5.0", + "symfony/process": "^3.4|^4.0|^5.0", + "symfony/routing": "^3.4|^4.0|^5.0", + "symfony/stopwatch": "^3.4|^4.0|^5.0", + "symfony/templating": "^3.4|^4.0|^5.0", + "symfony/translation": "^4.2|^5.0", + "symfony/translation-contracts": "^1.1|^2", + "twig/twig": "^1.43|^2.13|^3.0.4" + }, + "suggest": { + "symfony/browser-kit": "", + "symfony/config": "", + "symfony/console": "", + "symfony/dependency-injection": "" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\Debug\\": "" + "Symfony\\Component\\HttpKernel\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -312,10 +927,10 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Provides tools to ease debugging PHP code", + "description": "Provides a structured process for converting a Request into a Response", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/debug/tree/v4.4.37" + "source": "https://github.com/symfony/http-kernel/tree/v4.4.50" }, "funding": [ { @@ -331,44 +946,48 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:41:36+00:00" + "time": "2023-02-01T08:01:31+00:00" }, { - "name": "symfony/event-dispatcher", - "version": "v3.4.47", + "name": "symfony/mime", + "version": "v5.4.19", "source": { "type": "git", - "url": "https://github.com/symfony/event-dispatcher.git", - "reference": "31fde73757b6bad247c54597beef974919ec6860" + "url": "https://github.com/symfony/mime.git", + "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/31fde73757b6bad247c54597beef974919ec6860", - "reference": "31fde73757b6bad247c54597beef974919ec6860", + "url": "https://api.github.com/repos/symfony/mime/zipball/a858429a9c704edc53fe057228cf9ca282ba48eb", + "reference": "a858429a9c704edc53fe057228cf9ca282ba48eb", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.1|^3", + "symfony/polyfill-intl-idn": "^1.10", + "symfony/polyfill-mbstring": "^1.0", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "symfony/dependency-injection": "<3.3" + "egulias/email-validator": "~3.0.0", + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/mailer": "<4.4", + "symfony/serializer": "<5.4.14|>=6.0,<6.0.14|>=6.1,<6.1.6" }, "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/debug": "~3.4|~4.4", - "symfony/dependency-injection": "~3.3|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0" - }, - "suggest": { - "symfony/dependency-injection": "", - "symfony/http-kernel": "" + "egulias/email-validator": "^2.1.10|^3.1|^4", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/dependency-injection": "^4.4|^5.0|^6.0", + "symfony/property-access": "^4.4|^5.1|^6.0", + "symfony/property-info": "^4.4|^5.1|^6.0", + "symfony/serializer": "^5.4.14|~6.0.14|^6.1.6" }, "type": "library", "autoload": { "psr-4": { - "Symfony\\Component\\EventDispatcher\\": "" + "Symfony\\Component\\Mime\\": "" }, "exclude-from-classmap": [ "/Tests/" @@ -388,10 +1007,14 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony EventDispatcher Component", + "description": "Allows manipulating MIME messages", "homepage": "https://symfony.com", + "keywords": [ + "mime", + "mime-type" + ], "support": { - "source": "https://github.com/symfony/event-dispatcher/tree/v3.4.47" + "source": "https://github.com/symfony/mime/tree/v5.4.19" }, "funding": [ { @@ -407,38 +1030,48 @@ "type": "tidelift" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2023-01-09T05:43:46+00:00" }, { - "name": "symfony/http-foundation", - "version": "v3.4.47", + "name": "symfony/polyfill-ctype", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-foundation.git", - "reference": "b9885fcce6fe494201da4f70a9309770e9d13dc8" + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-foundation/zipball/b9885fcce6fe494201da4f70a9309770e9d13dc8", - "reference": "b9885fcce6fe494201da4f70a9309770e9d13dc8", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", + "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "symfony/polyfill-mbstring": "~1.1", - "symfony/polyfill-php70": "~1.6" + "php": ">=7.1" }, - "require-dev": { - "symfony/expression-language": "~2.8|~3.0|~4.0" + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\HttpFoundation\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Polyfill\\Ctype\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -446,18 +1079,24 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpFoundation Component", + "description": "Symfony polyfill for ctype functions", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], "support": { - "source": "https://github.com/symfony/http-foundation/tree/v3.4.47" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" }, "funding": [ { @@ -473,74 +1112,47 @@ "type": "tidelift" } ], - "time": "2020-10-24T10:57:07+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/http-kernel", - "version": "v3.4.49", + "name": "symfony/polyfill-intl-idn", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/http-kernel.git", - "reference": "5aa72405f5bd5583c36ed6e756acb17d3f98ac40" + "url": "https://github.com/symfony/polyfill-intl-idn.git", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/http-kernel/zipball/5aa72405f5bd5583c36ed6e756acb17d3f98ac40", - "reference": "5aa72405f5bd5583c36ed6e756acb17d3f98ac40", + "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/639084e360537a19f9ee352433b84ce831f3d2da", + "reference": "639084e360537a19f9ee352433b84ce831f3d2da", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", - "psr/log": "~1.0", - "symfony/debug": "^3.3.3|~4.0", - "symfony/event-dispatcher": "~2.8|~3.0|~4.0", - "symfony/http-foundation": "~3.4.12|~4.0.12|^4.1.1", - "symfony/polyfill-ctype": "~1.8", - "symfony/polyfill-php56": "~1.8" - }, - "conflict": { - "symfony/config": "<2.8", - "symfony/dependency-injection": "<3.4.10|<4.0.10,>=4", - "symfony/var-dumper": "<3.3", - "twig/twig": "<1.34|<2.4,>=2" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/cache": "~1.0", - "symfony/browser-kit": "~2.8|~3.0|~4.0", - "symfony/class-loader": "~2.8|~3.0", - "symfony/config": "~2.8|~3.0|~4.0", - "symfony/console": "~2.8|~3.0|~4.0", - "symfony/css-selector": "~2.8|~3.0|~4.0", - "symfony/dependency-injection": "^3.4.10|^4.0.10", - "symfony/dom-crawler": "~2.8|~3.0|~4.0", - "symfony/expression-language": "~2.8|~3.0|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/process": "~2.8|~3.0|~4.0", - "symfony/routing": "~3.4|~4.0", - "symfony/stopwatch": "~2.8|~3.0|~4.0", - "symfony/templating": "~2.8|~3.0|~4.0", - "symfony/translation": "~2.8|~3.0|~4.0", - "symfony/var-dumper": "~3.3|~4.0" + "php": ">=7.1", + "symfony/polyfill-intl-normalizer": "^1.10", + "symfony/polyfill-php72": "^1.10" }, "suggest": { - "symfony/browser-kit": "", - "symfony/config": "", - "symfony/console": "", - "symfony/dependency-injection": "", - "symfony/finder": "", - "symfony/var-dumper": "" + "ext-intl": "For best performance" }, "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.27-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, "autoload": { + "files": [ + "bootstrap.php" + ], "psr-4": { - "Symfony\\Component\\HttpKernel\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] + "Symfony\\Polyfill\\Intl\\Idn\\": "" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -548,18 +1160,30 @@ ], "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Laurent Bassin", + "email": "laurent@bassin.info" + }, + { + "name": "Trevor Rowbotham", + "email": "trevor.rowbotham@pm.me" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony HttpKernel Component", + "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "idn", + "intl", + "polyfill", + "portable", + "shim" + ], "support": { - "source": "https://github.com/symfony/http-kernel/tree/v3.4.49" + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.27.0" }, "funding": [ { @@ -575,35 +1199,32 @@ "type": "tidelift" } ], - "time": "2021-05-19T12:06:59+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/polyfill-ctype", - "version": "v1.26.0", + "name": "symfony/polyfill-intl-normalizer", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4" + "url": "https://github.com/symfony/polyfill-intl-normalizer.git", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", - "reference": "6fd1b9a79f6e3cf65f9e679b23af304cd9e010d4", + "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/19bd1e4fcd5b91116f14d8533c57831ed00571b6", + "reference": "19bd1e4fcd5b91116f14d8533c57831ed00571b6", "shasum": "" }, "require": { "php": ">=7.1" }, - "provide": { - "ext-ctype": "*" - }, "suggest": { - "ext-ctype": "For best performance" + "ext-intl": "For best performance" }, "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -615,8 +1236,11 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Ctype\\": "" - } + "Symfony\\Polyfill\\Intl\\Normalizer\\": "" + }, + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ @@ -624,24 +1248,26 @@ ], "authors": [ { - "name": "Gert de Pagter", - "email": "BackEndTea@gmail.com" + "name": "Nicolas Grekas", + "email": "p@tchwork.com" }, { "name": "Symfony Community", "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill for ctype functions", + "description": "Symfony polyfill for intl's Normalizer class and related functions", "homepage": "https://symfony.com", "keywords": [ "compatibility", - "ctype", + "intl", + "normalizer", "polyfill", - "portable" + "portable", + "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.27.0" }, "funding": [ { @@ -657,20 +1283,20 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.26.0", + "version": "v1.27.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e" + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", - "reference": "9344f9cb97f3b19424af1a21a3b0e75b0a7d8d7e", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", "shasum": "" }, "require": { @@ -685,7 +1311,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -724,7 +1350,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" }, "funding": [ { @@ -740,35 +1366,43 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/polyfill-php56", - "version": "v1.20.0", + "name": "symfony/polyfill-php72", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php56.git", - "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675" + "url": "https://github.com/symfony/polyfill-php72.git", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", - "reference": "54b8cd7e6c1643d78d011f3be89f3ef1f9f4c675", + "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/869329b1e9894268a8a61dabb69153029b7a8c97", + "reference": "869329b1e9894268a8a61dabb69153029b7a8c97", "shasum": "" }, "require": { "php": ">=7.1" }, - "type": "metapackage", + "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php72\\": "" + } + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -783,7 +1417,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -792,7 +1426,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php56/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-php72/tree/v1.27.0" }, "funding": [ { @@ -808,35 +1442,46 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/polyfill-php70", - "version": "v1.20.0", + "name": "symfony/polyfill-php73", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php70.git", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644" + "url": "https://github.com/symfony/polyfill-php73.git", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/5f03a781d984aae42cebd18e7912fa80f02ee644", - "reference": "5f03a781d984aae42cebd18e7912fa80f02ee644", + "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/9e8ecb5f92152187c4799efd3c96b78ccab18ff9", + "reference": "9e8ecb5f92152187c4799efd3c96b78ccab18ff9", "shasum": "" }, "require": { "php": ">=7.1" }, - "type": "metapackage", + "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" } }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php73\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" @@ -851,7 +1496,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 7.3+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -860,7 +1505,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php70/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.27.0" }, "funding": [ { @@ -876,20 +1521,20 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { - "name": "symfony/polyfill-php72", - "version": "v1.26.0", + "name": "symfony/polyfill-php80", + "version": "v1.27.0", "source": { "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2" + "url": "https://github.com/symfony/polyfill-php80.git", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/bf44a9fd41feaac72b074de600314a93e2ae78e2", - "reference": "bf44a9fd41feaac72b074de600314a93e2ae78e2", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", "shasum": "" }, "require": { @@ -898,7 +1543,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.26-dev" + "dev-main": "1.27-dev" }, "thanks": { "name": "symfony/polyfill", @@ -910,14 +1555,21 @@ "bootstrap.php" ], "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - } + "Symfony\\Polyfill\\Php80\\": "" + }, + "classmap": [ + "Resources/stubs" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Ion Bazan", + "email": "ion.bazan@gmail.com" + }, { "name": "Nicolas Grekas", "email": "p@tchwork.com" @@ -927,7 +1579,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", + "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions", "homepage": "https://symfony.com", "keywords": [ "compatibility", @@ -936,7 +1588,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.26.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" }, "funding": [ { @@ -952,51 +1604,48 @@ "type": "tidelift" } ], - "time": "2022-05-24T11:49:31+00:00" + "time": "2022-11-03T14:55:06+00:00" }, { "name": "symfony/routing", - "version": "v3.2.7", + "version": "v4.4.44", "source": { "type": "git", "url": "https://github.com/symfony/routing.git", - "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee" + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/routing/zipball/d6605f9a5767bc5bc4895e1c762ba93964608aee", - "reference": "d6605f9a5767bc5bc4895e1c762ba93964608aee", + "url": "https://api.github.com/repos/symfony/routing/zipball/f7751fd8b60a07f3f349947a309b5bdfce22d6ae", + "reference": "f7751fd8b60a07f3f349947a309b5bdfce22d6ae", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": ">=7.1.3", + "symfony/polyfill-php80": "^1.16" }, "conflict": { - "symfony/config": "<2.8" + "symfony/config": "<4.2", + "symfony/dependency-injection": "<3.4", + "symfony/yaml": "<3.4" }, "require-dev": { - "doctrine/annotations": "~1.0", - "doctrine/common": "~2.2", - "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/http-foundation": "~2.8|~3.0", - "symfony/yaml": "~2.8|~3.0" + "doctrine/annotations": "^1.10.4", + "psr/log": "^1|^2|^3", + "symfony/config": "^4.2|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/expression-language": "^3.4|^4.0|^5.0", + "symfony/http-foundation": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "doctrine/annotations": "For using the annotation loader", "symfony/config": "For using the all-in-one router or any loader", - "symfony/dependency-injection": "For loading routes from a service", "symfony/expression-language": "For using expression matching", "symfony/http-foundation": "For using a Symfony Request object", "symfony/yaml": "For using the YAML loader" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Component\\Routing\\": "" @@ -1019,7 +1668,7 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Routing Component", + "description": "Maps an HTTP request to a set of configuration variables", "homepage": "https://symfony.com", "keywords": [ "router", @@ -1027,7 +1676,24 @@ "uri", "url" ], - "time": "2017-03-02T15:58:09+00:00" + "support": { + "source": "https://github.com/symfony/routing/tree/v4.4.44" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-07-20T09:59:04+00:00" }, { "name": "symfony/twig-bridge", @@ -1110,6 +1776,95 @@ "homepage": "https://symfony.com", "time": "2017-03-28T08:44:09+00:00" }, + { + "name": "symfony/var-dumper", + "version": "v5.4.19", + "source": { + "type": "git", + "url": "https://github.com/symfony/var-dumper.git", + "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/var-dumper/zipball/2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "reference": "2944bbc23f5f8da2b962fbcbf7c4a6109b2f4b7b", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-mbstring": "~1.0", + "symfony/polyfill-php80": "^1.16" + }, + "conflict": { + "phpunit/phpunit": "<5.4.3", + "symfony/console": "<4.4" + }, + "require-dev": { + "ext-iconv": "*", + "symfony/console": "^4.4|^5.0|^6.0", + "symfony/process": "^4.4|^5.0|^6.0", + "symfony/uid": "^5.1|^6.0", + "twig/twig": "^2.13|^3.0.4" + }, + "suggest": { + "ext-iconv": "To convert non-UTF-8 strings to UTF-8 (or symfony/polyfill-iconv in case ext-iconv cannot be used).", + "ext-intl": "To show region name in time zone dump", + "symfony/console": "To use the ServerDumpCommand and/or the bin/var-dump-server script" + }, + "bin": [ + "Resources/bin/var-dump-server" + ], + "type": "library", + "autoload": { + "files": [ + "Resources/functions/dump.php" + ], + "psr-4": { + "Symfony\\Component\\VarDumper\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Provides mechanisms for walking through any arbitrary PHP variable", + "homepage": "https://symfony.com", + "keywords": [ + "debug", + "dump" + ], + "support": { + "source": "https://github.com/symfony/var-dumper/tree/v5.4.19" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-16T10:52:33+00:00" + }, { "name": "twig/twig", "version": "v2.15.3", From 0da034ef55ee3d2b8a1cecdc56c7a5120bc6c892 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 9 Feb 2023 19:50:35 +0000 Subject: [PATCH 155/871] chore(deps-dev): bump rack-test Bumps [rack-test](https://github.com/rack/rack-test) from 0.6.3 to 2.0.2. - [Release notes](https://github.com/rack/rack-test/releases) - [Changelog](https://github.com/rack/rack-test/blob/main/History.md) - [Commits](https://github.com/rack/rack-test/compare/v0.6.3...v2.0.2) --- updated-dependencies: - dependency-name: rack-test dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 5f67ebfa5..bba4a68f5 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -10,8 +10,8 @@ GEM rack (2.2.6.2) rack-protection (3.0.5) rack - rack-test (0.6.3) - rack (>= 1.0) + rack-test (2.0.2) + rack (>= 1.3) rake (13.0.6) ruby2_keywords (0.0.5) sinatra (3.0.5) From 1ee33b88cc1458b4dce4213bde4d63709e55bb0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 03:08:04 +0000 Subject: [PATCH 156/871] chore(deps): bump actions/setup-python from 2 to 4 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 4. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v2...v4) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 42c239ee5..fdb7b3f57 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -43,7 +43,7 @@ jobs: with: ruby-version: 2.6 - - uses: actions/setup-python@v2 + - uses: actions/setup-python@v4 with: python-version: '3.7.x' From 9709969bf0eb944a00a8ebc83910ba638d1f77ff Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 03:09:43 +0000 Subject: [PATCH 157/871] chore(deps): bump golang from 1.17 to 1.20 Bumps golang from 1.17 to 1.20. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 2d5429c77..0c3b9f8f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=18 -FROM golang:1.17 AS builder +FROM golang:1.20 AS builder RUN mkdir /src ADD . /src/ WORKDIR /src From 79c433435c069b10a32ec3e8eaa5d655e53e8243 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:06:13 +0000 Subject: [PATCH 158/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 1.6.12 to 1.6.13. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/1.6.12...1.6.13) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index d0001dfb1..7e9e92b69 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - rack (1.6.12) + rack (1.6.13) rack-protection (1.5.0) rack sinatra (1.4.2) From f3c9d7727925f707671dbe8ccb5f373cf58b0735 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:10:23 +0000 Subject: [PATCH 159/871] chore(deps): bump symfony/twig-bridge Bumps [symfony/twig-bridge](https://github.com/symfony/twig-bridge) from 3.2.7 to 5.2.12. - [Release notes](https://github.com/symfony/twig-bridge/releases) - [Changelog](https://github.com/symfony/twig-bridge/blob/6.2/CHANGELOG.md) - [Commits](https://github.com/symfony/twig-bridge/compare/v3.2.7...v5.2.12) --- updated-dependencies: - dependency-name: symfony/twig-bridge dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.json | 2 +- .../buildpack-php/tests/php/composer.lock | 189 ++++++++++++++---- 2 files changed, 154 insertions(+), 37 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.json b/buildpacks/buildpack-php/tests/php/composer.json index 1a3934439..01f447151 100644 --- a/buildpacks/buildpack-php/tests/php/composer.json +++ b/buildpacks/buildpack-php/tests/php/composer.json @@ -3,7 +3,7 @@ "silex/silex": "^2.0.4", "monolog/monolog": "^1.22", "twig/twig": "^2.0", - "symfony/twig-bridge": "^3" + "symfony/twig-bridge": "^5" }, "require-dev": { "heroku/heroku-buildpack-php": "*" diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 0d6917964..8d8d0d008 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e66fd5c3f8342ff9ed1f0d21aab6ef81", + "content-hash": "a18b12e8c1ae68a6b961b2524cf52e5f", "packages": [ { "name": "monolog/monolog", @@ -1695,40 +1695,143 @@ ], "time": "2022-07-20T09:59:04+00:00" }, + { + "name": "symfony/translation-contracts", + "version": "v2.5.2", + "source": { + "type": "git", + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "reference": "136b19dd05cdf0709db6537d058bcab6dd6e2dbe", + "shasum": "" + }, + "require": { + "php": ">=7.2.5" + }, + "suggest": { + "symfony/translation-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "2.5-dev" + }, + "thanks": { + "name": "symfony/contracts", + "url": "https://github.com/symfony/contracts" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "support": { + "source": "https://github.com/symfony/translation-contracts/tree/v2.5.2" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2022-06-27T16:58:25+00:00" + }, { "name": "symfony/twig-bridge", - "version": "v3.2.7", + "version": "v5.2.12", "source": { "type": "git", "url": "https://github.com/symfony/twig-bridge.git", - "reference": "cb632b9a81f0262d6eff9097e46903f272070015" + "reference": "243a7c6416fea3b91391f09831d8d04b2e42c0b1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/cb632b9a81f0262d6eff9097e46903f272070015", - "reference": "cb632b9a81f0262d6eff9097e46903f272070015", + "url": "https://api.github.com/repos/symfony/twig-bridge/zipball/243a7c6416fea3b91391f09831d8d04b2e42c0b1", + "reference": "243a7c6416fea3b91391f09831d8d04b2e42c0b1", "shasum": "" }, "require": { - "php": ">=5.5.9", - "twig/twig": "~1.28|~2.0" + "php": ">=7.2.5", + "symfony/polyfill-php80": "^1.16", + "symfony/translation-contracts": "^1.1|^2", + "twig/twig": "^2.13|^3.0.4" + }, + "conflict": { + "phpdocumentor/reflection-docblock": "<3.2.2", + "phpdocumentor/type-resolver": "<1.4.0", + "symfony/console": "<4.4", + "symfony/form": "<5.1", + "symfony/http-foundation": "<4.4", + "symfony/http-kernel": "<4.4", + "symfony/translation": "<5.2", + "symfony/workflow": "<5.2" }, "require-dev": { - "symfony/asset": "~2.8|~3.0", - "symfony/console": "~2.8|~3.0", - "symfony/expression-language": "~2.8|~3.0", - "symfony/finder": "~2.8|~3.0", - "symfony/form": "^3.2.5", - "symfony/http-kernel": "~3.2", + "egulias/email-validator": "^2.1.10|^3", + "phpdocumentor/reflection-docblock": "^3.0|^4.0|^5.0", + "symfony/asset": "^4.4|^5.0", + "symfony/console": "^4.4|^5.0", + "symfony/dependency-injection": "^4.4|^5.0", + "symfony/expression-language": "^4.4|^5.0", + "symfony/finder": "^4.4|^5.0", + "symfony/form": "^5.1.9", + "symfony/http-foundation": "^4.4|^5.0", + "symfony/http-kernel": "^4.4|^5.0", + "symfony/intl": "^4.4|^5.0", + "symfony/mime": "^5.2", "symfony/polyfill-intl-icu": "~1.0", - "symfony/routing": "~2.8|~3.0", - "symfony/security": "~2.8|~3.0", - "symfony/security-acl": "~2.8|~3.0", - "symfony/stopwatch": "~2.8|~3.0", - "symfony/templating": "~2.8|~3.0", - "symfony/translation": "~2.8|~3.0", - "symfony/var-dumper": "~2.8.10|~3.1.4|~3.2", - "symfony/yaml": "~2.8|~3.0" + "symfony/property-info": "^4.4|^5.1", + "symfony/routing": "^4.4|^5.0", + "symfony/security-acl": "^2.8|^3.0", + "symfony/security-core": "^4.4|^5.0", + "symfony/security-csrf": "^4.4|^5.0", + "symfony/security-http": "^4.4|^5.0", + "symfony/serializer": "^5.2", + "symfony/stopwatch": "^4.4|^5.0", + "symfony/translation": "^5.2", + "symfony/web-link": "^4.4|^5.0", + "symfony/workflow": "^5.2", + "symfony/yaml": "^4.4|^5.0", + "twig/cssinliner-extra": "^2.12|^3", + "twig/inky-extra": "^2.12|^3", + "twig/markdown-extra": "^2.12|^3" }, "suggest": { "symfony/asset": "For using the AssetExtension", @@ -1737,19 +1840,16 @@ "symfony/form": "For using the FormExtension", "symfony/http-kernel": "For using the HttpKernelExtension", "symfony/routing": "For using the RoutingExtension", - "symfony/security": "For using the SecurityExtension", + "symfony/security-core": "For using the SecurityExtension", + "symfony/security-csrf": "For using the CsrfExtension", + "symfony/security-http": "For using the LogoutUrlExtension", "symfony/stopwatch": "For using the StopwatchExtension", - "symfony/templating": "For using the TwigEngine", "symfony/translation": "For using the TranslationExtension", "symfony/var-dumper": "For using the DumpExtension", + "symfony/web-link": "For using the WebLinkExtension", "symfony/yaml": "For using the YamlExtension" }, "type": "symfony-bridge", - "extra": { - "branch-alias": { - "dev-master": "3.2-dev" - } - }, "autoload": { "psr-4": { "Symfony\\Bridge\\Twig\\": "" @@ -1772,9 +1872,26 @@ "homepage": "https://symfony.com/contributors" } ], - "description": "Symfony Twig Bridge", + "description": "Provides integration for Twig with various Symfony components", "homepage": "https://symfony.com", - "time": "2017-03-28T08:44:09+00:00" + "support": { + "source": "https://github.com/symfony/twig-bridge/tree/v5.2.12" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2021-07-26T16:33:12+00:00" }, { "name": "symfony/var-dumper", @@ -1867,16 +1984,16 @@ }, { "name": "twig/twig", - "version": "v2.15.3", + "version": "v2.15.4", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "ab402673db8746cb3a4c46f3869d6253699f614a" + "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/ab402673db8746cb3a4c46f3869d6253699f614a", - "reference": "ab402673db8746cb3a4c46f3869d6253699f614a", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3", + "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3", "shasum": "" }, "require": { @@ -1931,7 +2048,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.3" + "source": "https://github.com/twigphp/Twig/tree/v2.15.4" }, "funding": [ { @@ -1943,7 +2060,7 @@ "type": "tidelift" } ], - "time": "2022-09-28T08:40:08+00:00" + "time": "2022-12-27T12:26:20+00:00" } ], "packages-dev": [ From 1cd53d4c33f9a9dbf972733d3e937e30777a2d82 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:10:29 +0000 Subject: [PATCH 160/871] chore(deps): bump actions/setup-go from 2 to 3 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 2 to 3. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdb7b3f57..e0ad858e0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: 1.17.8 @@ -119,7 +119,7 @@ jobs: steps: - uses: actions/checkout@v2 - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: go-version: 1.17.8 From 0118ff8d26510c0d0f98558f7dcf9a327a339925 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:10:48 +0000 Subject: [PATCH 161/871] chore(deps): bump docker/login-action from 1 to 2 Bumps [docker/login-action](https://github.com/docker/login-action) from 1 to 2. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v1...v2) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fdb7b3f57..69237983f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -158,7 +158,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 978a83793..840483194 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 358a7842950ceb793b4a2a7f4abbda3542d48ab6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:13:47 +0000 Subject: [PATCH 162/871] chore(deps): bump jinja2 Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.3 to 3.1.2. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/2.11.3...3.1.2) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 5eb1826f1..20ffa3186 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==1.1.4 -Jinja2==2.11.3 +Jinja2==3.1.2 gunicorn==19.5.0 markupsafe==2.0.1 From b8bfc43412886d1c0787f3f9a71c8a63ad01c41f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:15:13 +0000 Subject: [PATCH 163/871] chore(deps): bump markupsafe in /buildpacks/buildpack-multi/tests/multi Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.0.1 to 2.1.2. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.0.1...2.1.2) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 5eb1826f1..37d76905c 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==1.1.4 Jinja2==2.11.3 gunicorn==19.5.0 -markupsafe==2.0.1 +markupsafe==2.1.2 From 2eddd77f225bcd32dad71c0b3efc284bb8e6c91b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 18:15:35 +0000 Subject: [PATCH 164/871] chore(deps): bump markupsafe Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.0.1 to 2.1.2. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.0.1...2.1.2) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 5eb1826f1..37d76905c 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==1.1.4 Jinja2==2.11.3 gunicorn==19.5.0 -markupsafe==2.0.1 +markupsafe==2.1.2 From 583982ee14459cbcbccdc28348fdee501f11e857 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 19:07:30 +0000 Subject: [PATCH 165/871] chore(deps): bump jinja2 in /buildpacks/buildpack-multi/tests/multi Bumps [jinja2](https://github.com/pallets/jinja) from 2.11.3 to 3.1.2. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/2.11.3...3.1.2) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 301c0f1e9..ac1d587c6 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==2.2.2 -Jinja2==2.11.3 +Jinja2==3.1.2 gunicorn==19.5.0 markupsafe==2.1.2 From ce5177334959ec54af82bd7fc100f603ce77fca3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 Feb 2023 23:43:53 +0000 Subject: [PATCH 166/871] chore(deps): bump actions/checkout from 2 to 3 Bumps [actions/checkout](https://github.com/actions/checkout) from 2 to 3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 6 +++--- .github/workflows/release.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 644f13d25..ec55728df 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - build build/docker/22 BUILDX=false STACK_VERSION=22 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 @@ -117,7 +117,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: actions/setup-go@v3 with: @@ -145,7 +145,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 840483194..c407a8a11 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -20,7 +20,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: fetch-depth: 0 From fb66924166b49e85358c98b60b0058ce0c3c2e90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:28:08 +0000 Subject: [PATCH 167/871] chore(deps): bump actions/download-artifact from 1 to 3 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 1 to 3. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v1...v3) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec55728df..a592bb191 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -124,7 +124,7 @@ jobs: go-version: 1.17.8 - name: download packages - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: build @@ -152,7 +152,7 @@ jobs: ruby-version: 2.6 - name: download packages - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v3 with: name: build From d063b8a47e1e72f2d8fe2e84acce2521d92fcb49 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:28:14 +0000 Subject: [PATCH 168/871] chore(deps): bump actions/upload-artifact from 2 to 3 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index ec55728df..0cc2340e6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -84,7 +84,7 @@ jobs: fi - name: upload packages - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: build path: build From 150f0745727fc57ab05ff2b7cb08d190f63ca5e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 10:28:15 +0000 Subject: [PATCH 169/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 1.1.4 to 2.2.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/1.1.4...2.2.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index a4edd846a..ac1d587c6 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==1.1.4 +Flask==2.2.2 Jinja2==3.1.2 gunicorn==19.5.0 markupsafe==2.1.2 From 07fd185c80386515edd5e64fe5f60405a78958e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 11:46:25 +0000 Subject: [PATCH 170/871] chore(deps): bump gunicorn in /buildpacks/buildpack-multi/tests/multi Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 19.5.0 to 20.1.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/19.5.0...20.1.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index ac1d587c6..1605a7003 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==2.2.2 Jinja2==3.1.2 -gunicorn==19.5.0 +gunicorn==20.1.0 markupsafe==2.1.2 From 90bd647572abddecf62e0a1bc12bd42923324032 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 11:46:53 +0000 Subject: [PATCH 171/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.4.2 to 1.4.8. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.4.2...v1.4.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 7e9e92b69..302220781 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -2,13 +2,13 @@ GEM remote: http://rubygems.org/ specs: rack (1.6.13) - rack-protection (1.5.0) + rack-protection (1.5.5) rack - sinatra (1.4.2) - rack (~> 1.5, >= 1.5.2) + sinatra (1.4.8) + rack (~> 1.5) rack-protection (~> 1.4) - tilt (~> 1.3, >= 1.3.4) - tilt (1.3.6) + tilt (>= 1.3, < 3) + tilt (2.0.11) PLATFORMS ruby From 4186f31c7502e7de9cb5a4092aad3a585f9c40b4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 11:47:04 +0000 Subject: [PATCH 172/871] chore(deps): bump monolog/monolog in /buildpacks/buildpack-php/tests/php Bumps [monolog/monolog](https://github.com/Seldaek/monolog) from 1.22.1 to 2.9.1. - [Release notes](https://github.com/Seldaek/monolog/releases) - [Changelog](https://github.com/Seldaek/monolog/blob/main/CHANGELOG.md) - [Upgrade guide](https://github.com/Seldaek/monolog/blob/main/UPGRADE.md) - [Commits](https://github.com/Seldaek/monolog/compare/1.22.1...2.9.1) --- updated-dependencies: - dependency-name: monolog/monolog dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.json | 2 +- .../buildpack-php/tests/php/composer.lock | 76 ++++++++++++------- 2 files changed, 51 insertions(+), 27 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.json b/buildpacks/buildpack-php/tests/php/composer.json index 01f447151..40d636cee 100644 --- a/buildpacks/buildpack-php/tests/php/composer.json +++ b/buildpacks/buildpack-php/tests/php/composer.json @@ -1,7 +1,7 @@ { "require" : { "silex/silex": "^2.0.4", - "monolog/monolog": "^1.22", + "monolog/monolog": "^2.9", "twig/twig": "^2.0", "symfony/twig-bridge": "^5" }, diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 8d8d0d008..0d17c7783 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -4,59 +4,69 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a18b12e8c1ae68a6b961b2524cf52e5f", + "content-hash": "f76c92045d77eb939b2ffd4cfac06042", "packages": [ { "name": "monolog/monolog", - "version": "1.22.1", + "version": "2.9.1", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0" + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/1e044bc4b34e91743943479f1be7a1d5eb93add0", - "reference": "1e044bc4b34e91743943479f1be7a1d5eb93add0", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", "shasum": "" }, "require": { - "php": ">=5.3.0", - "psr/log": "~1.0" + "php": ">=7.2", + "psr/log": "^1.0.1 || ^2.0 || ^3.0" }, "provide": { - "psr/log-implementation": "1.0.0" + "psr/log-implementation": "1.0.0 || 2.0.0 || 3.0.0" }, "require-dev": { "aws/aws-sdk-php": "^2.4.9 || ^3.0", "doctrine/couchdb": "~1.0@dev", - "graylog2/gelf-php": "~1.0", - "jakub-onderka/php-parallel-lint": "0.9", - "php-amqplib/php-amqplib": "~2.4", - "php-console/php-console": "^3.1.3", - "phpunit/phpunit": "~4.5", - "phpunit/phpunit-mock-objects": "2.3.0", - "ruflin/elastica": ">=0.90 <3.0", - "sentry/sentry": "^0.13", - "swiftmailer/swiftmailer": "~5.3" + "elasticsearch/elasticsearch": "^7 || ^8", + "ext-json": "*", + "graylog2/gelf-php": "^1.4.2 || ^2@dev", + "guzzlehttp/guzzle": "^7.4", + "guzzlehttp/psr7": "^2.2", + "mongodb/mongodb": "^1.8", + "php-amqplib/php-amqplib": "~2.4 || ^3", + "phpspec/prophecy": "^1.15", + "phpstan/phpstan": "^0.12.91", + "phpunit/phpunit": "^8.5.14", + "predis/predis": "^1.1 || ^2.0", + "rollbar/rollbar": "^1.3 || ^2 || ^3", + "ruflin/elastica": "^7", + "swiftmailer/swiftmailer": "^5.3|^6.0", + "symfony/mailer": "^5.4 || ^6", + "symfony/mime": "^5.4 || ^6" }, "suggest": { "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB", "doctrine/couchdb": "Allow sending log messages to a CouchDB server", + "elasticsearch/elasticsearch": "Allow sending log messages to an Elasticsearch server via official client", "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)", - "ext-mongo": "Allow sending log messages to a MongoDB server", + "ext-curl": "Required to send log messages using the IFTTTHandler, the LogglyHandler, the SendGridHandler, the SlackWebhookHandler or the TelegramBotHandler", + "ext-mbstring": "Allow to work properly with unicode symbols", + "ext-mongodb": "Allow sending log messages to a MongoDB server (via driver)", + "ext-openssl": "Required to send log messages using SSL", + "ext-sockets": "Allow sending log messages to a Syslog server (via UDP driver)", "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server", - "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver", + "mongodb/mongodb": "Allow sending log messages to a MongoDB server (via library)", "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib", - "php-console/php-console": "Allow sending log messages to Google Chrome", "rollbar/rollbar": "Allow sending log messages to Rollbar", - "ruflin/elastica": "Allow sending log messages to an Elastic Search server", - "sentry/sentry": "Allow sending log messages to a Sentry server" + "ruflin/elastica": "Allow sending log messages to an Elastic Search server" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-main": "2.x-dev" } }, "autoload": { @@ -72,17 +82,31 @@ { "name": "Jordi Boggiano", "email": "j.boggiano@seld.be", - "homepage": "http://seld.be" + "homepage": "https://seld.be" } ], "description": "Sends your logs to files, sockets, inboxes, databases and various web services", - "homepage": "http://github.com/Seldaek/monolog", + "homepage": "https://github.com/Seldaek/monolog", "keywords": [ "log", "logging", "psr-3" ], - "time": "2017-03-13T07:08:03+00:00" + "support": { + "issues": "https://github.com/Seldaek/monolog/issues", + "source": "https://github.com/Seldaek/monolog/tree/2.9.1" + }, + "funding": [ + { + "url": "https://github.com/Seldaek", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/monolog/monolog", + "type": "tidelift" + } + ], + "time": "2023-02-06T13:44:46+00:00" }, { "name": "pimple/pimple", From cc1c642f61126020e658186dc666a148c5970e44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 13:18:26 +0000 Subject: [PATCH 173/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 19.5.0 to 20.1.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/19.5.0...20.1.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index ac1d587c6..1605a7003 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==2.2.2 Jinja2==3.1.2 -gunicorn==19.5.0 +gunicorn==20.1.0 markupsafe==2.1.2 From 5088b802c12b36fdd72c7f1d234731f0951f4394 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 11 Feb 2023 19:27:45 +0000 Subject: [PATCH 174/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 121 to 230. - [Release notes](https://github.com/heroku/heroku-buildpack-php/releases) - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v121...v230) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 0d17c7783..46e730e5c 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2090,21 +2090,19 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v121", + "version": "v230", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "727aa850a02a7af94c9225237464be8e8c8ff6db" + "reference": "b41246b8c2d84f1b18d05223f3c1332204130181" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/727aa850a02a7af94c9225237464be8e8c8ff6db", - "reference": "727aa850a02a7af94c9225237464be8e8c8ff6db", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/b41246b8c2d84f1b18d05223f3c1332204130181", + "reference": "b41246b8c2d84f1b18d05223f3c1332204130181", "shasum": "" }, "bin": [ - "bin/heroku-hhvm-apache2", - "bin/heroku-hhvm-nginx", "bin/heroku-php-apache2", "bin/heroku-php-nginx" ], @@ -2119,18 +2117,21 @@ "email": "dz@heroku.com" } ], - "description": "Toolkit for starting a PHP application locally, with or without foreman, using the same config for PHP/HHVM and Apache2/Nginx as on Heroku", + "description": "Toolkit for starting a PHP application locally, with or without foreman, using the same config for PHP and Apache2/Nginx as on Heroku", "homepage": "https://github.com/heroku/heroku-buildpack-php", "keywords": [ "apache", "apache2", "foreman", "heroku", - "hhvm", "nginx", "php" ], - "time": "2017-03-27T23:33:27+00:00" + "support": { + "issues": "https://github.com/heroku/heroku-buildpack-php/issues", + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v230" + }, + "time": "2023-02-07T21:32:41+00:00" } ], "aliases": [], From c9e7efce462bd670413f91eb22fd556a1cb8bce4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 12 Feb 2023 18:24:42 +0000 Subject: [PATCH 175/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 2.15.4 to 3.5.1. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v2.15.4...v3.5.1) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.json | 2 +- .../buildpack-php/tests/php/composer.lock | 24 ++++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.json b/buildpacks/buildpack-php/tests/php/composer.json index 40d636cee..f7209c219 100644 --- a/buildpacks/buildpack-php/tests/php/composer.json +++ b/buildpacks/buildpack-php/tests/php/composer.json @@ -2,7 +2,7 @@ "require" : { "silex/silex": "^2.0.4", "monolog/monolog": "^2.9", - "twig/twig": "^2.0", + "twig/twig": "^3.5", "symfony/twig-bridge": "^5" }, "require-dev": { diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 46e730e5c..ef5d08861 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f76c92045d77eb939b2ffd4cfac06042", + "content-hash": "421b1b843e079e634294669e102c10d2", "packages": [ { "name": "monolog/monolog", @@ -2008,23 +2008,22 @@ }, { "name": "twig/twig", - "version": "v2.15.4", + "version": "v3.5.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3" + "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/3e059001d6d597dd50ea7c74dd2464b4adea48d3", - "reference": "3e059001d6d597dd50ea7c74dd2464b4adea48d3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6e0510cc793912b451fd40ab983a1d28f611c15", + "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15", "shasum": "" }, "require": { - "php": ">=7.1.3", + "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php72": "^1.8" + "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { "psr/container": "^1.0", @@ -2033,13 +2032,10 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.15-dev" + "dev-master": "3.5-dev" } }, "autoload": { - "psr-0": { - "Twig_": "lib/" - }, "psr-4": { "Twig\\": "src/" } @@ -2072,7 +2068,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v2.15.4" + "source": "https://github.com/twigphp/Twig/tree/v3.5.1" }, "funding": [ { @@ -2084,7 +2080,7 @@ "type": "tidelift" } ], - "time": "2022-12-27T12:26:20+00:00" + "time": "2023-02-08T07:49:20+00:00" } ], "packages-dev": [ From e25a5446de6de2cb8cbbb2434c7288a861b94112 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 12 Feb 2023 14:55:00 -0500 Subject: [PATCH 176/871] Update ruby to version v252 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 25953a18d..1980255fe 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v251 +v252 From dd20484d000ba8fc14d3be521f934fc6dc3047d7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 12 Feb 2023 14:55:01 -0500 Subject: [PATCH 177/871] Update python to version v225 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index cc08b9dfa..873b26053 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v224 +v225 From d782f8f43973b2949fd6b764df5ba63f83b507df Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 11:56:44 +0000 Subject: [PATCH 178/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.0.2 to 6.1.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.0.2...v6.1.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index bba4a68f5..14340dee6 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -5,7 +5,7 @@ GEM ruby2_keywords (~> 0.0.1) nio4r (2.5.8) power_assert (2.0.3) - puma (6.0.2) + puma (6.1.0) nio4r (~> 2.0) rack (2.2.6.2) rack-protection (3.0.5) From 61044444be85a9579ad3abd9ebb2113ef2088749 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Feb 2023 19:54:40 +0000 Subject: [PATCH 179/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.4.8 to 3.0.5. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v1.4.8...v3.0.5) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 302220781..8f3a9255a 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,13 +1,17 @@ GEM remote: http://rubygems.org/ specs: - rack (1.6.13) - rack-protection (1.5.5) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.6.2) + rack-protection (3.0.5) rack - sinatra (1.4.8) - rack (~> 1.5) - rack-protection (~> 1.4) - tilt (>= 1.3, < 3) + ruby2_keywords (0.0.5) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) + tilt (~> 2.0) tilt (2.0.11) PLATFORMS From 0c03d76cd9e613e58c4aa2289081f29db90d9cde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 15 Feb 2023 11:56:31 +0000 Subject: [PATCH 180/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 230 to 231. - [Release notes](https://github.com/heroku/heroku-buildpack-php/releases) - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v230...v231) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index ef5d08861..583f18151 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2086,16 +2086,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v230", + "version": "v231", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "b41246b8c2d84f1b18d05223f3c1332204130181" + "reference": "5c628e7e989e9d96d742bea67f3245bebe5fc7be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/b41246b8c2d84f1b18d05223f3c1332204130181", - "reference": "b41246b8c2d84f1b18d05223f3c1332204130181", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/5c628e7e989e9d96d742bea67f3245bebe5fc7be", + "reference": "5c628e7e989e9d96d742bea67f3245bebe5fc7be", "shasum": "" }, "bin": [ @@ -2125,9 +2125,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v230" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v231" }, - "time": "2023-02-07T21:32:41+00:00" + "time": "2023-02-14T21:03:27+00:00" } ], "aliases": [], From 7cfd72b2f2ce907cd36c904a64623031eff443a6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 11:56:35 +0000 Subject: [PATCH 181/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.2.2...2.2.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 1605a7003..b50afb77a 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.2.2 +Flask==2.2.3 Jinja2==3.1.2 gunicorn==20.1.0 markupsafe==2.1.2 From 459f1acf0e53c46bac8fb8e2d921a9559106508f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 11:56:35 +0000 Subject: [PATCH 182/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 2.2.2 to 2.2.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.2.2...2.2.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 1605a7003..b50afb77a 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.2.2 +Flask==2.2.3 Jinja2==3.1.2 gunicorn==20.1.0 markupsafe==2.1.2 From 0d29d880aa8af50e91cfe7163401238e1741b06c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 17 Feb 2023 02:11:06 +0000 Subject: [PATCH 183/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 1.6.13 to 3.0.4.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/1.6.13...v3.0.4.1) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8f3a9255a..58f8617da 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.6.2) - rack-protection (3.0.5) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.5) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) - tilt (~> 2.0) - tilt (2.0.11) + rack (3.0.4.1) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From f3252b360109264d924ad48e8f059589ad6a4efe Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 16 Feb 2023 23:01:44 -0500 Subject: [PATCH 184/871] Update nodejs to version v203 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 2076b6e9d..c8821497c 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v202 +v203 From 2ba02a0a5d883d0cd4389960d1622b74fc9f9e37 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 16 Feb 2023 23:01:45 -0500 Subject: [PATCH 185/871] Update python to version v226 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 873b26053..3e1126dc8 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v225 +v226 From a8d029d356ea87b5d8e016d0426d2f6aa0c82bf5 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 16 Feb 2023 23:01:46 -0500 Subject: [PATCH 186/871] Update php to version v231 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index c2800375c..df001f256 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v230 +v231 From 038b1d424e9c609db6efc0f5e28d4d242d5b6b37 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 17 Feb 2023 00:25:00 -0500 Subject: [PATCH 187/871] Release 0.5.41 - @dependabot chore(deps): bump docker/login-action from 1 to 2 #829 - @dependabot chore(deps): bump maven-compiler-plugin from 2.3.2 to 3.10.1 in /buildpacks/buildpack-java/tests/java-jetty #830 - @dependabot chore(deps-dev): bump heroku/heroku-buildpack-php from 121 to 230 in /buildpacks/buildpack-php/tests/php #831 - @dependabot chore(deps): bump actions/checkout from 2 to 3 #832 - @dependabot chore(deps): bump gopkg.in/yaml.v2 from 2.2.8 to 2.4.0 #833 - @dependabot chore(deps): bump maven-dependency-plugin from 2.4 to 3.5.0 in /buildpacks/buildpack-java/tests/java-jetty #834 - @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-multi/tests/multi #835 - @dependabot chore(deps): bump express from 3.1.2 to 4.18.2 in /buildpacks/buildpack-nodejs/tests/nodejs-express #836 - @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-python/tests/python-flask #837 - @dependabot chore(deps): bump actions/download-artifact from 1 to 3 #838 - @dependabot chore(deps): bump express from 3.1.2 to 4.18.2 in /buildpacks/buildpack-multi/tests/multi #839 - @dependabot chore(deps): bump rack from 1.6.12 to 1.6.13 in /buildpacks/buildpack-multi/tests/multi #841 - @dependabot chore(deps): bump actions/upload-artifact from 2 to 3 #842 - @dependabot chore(deps): bump jinja2 from 2.11.3 to 3.1.2 in /buildpacks/buildpack-python/tests/python-flask #844 - @dependabot chore(deps): bump jinja2 from 2.11.3 to 3.1.2 in /buildpacks/buildpack-multi/tests/multi #845 - @dependabot chore(deps): bump actions/setup-go from 2 to 3 #847 - @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-python/tests/python-django #848 - @dependabot chore(deps): bump markupsafe from 2.0.1 to 2.1.2 in /buildpacks/buildpack-multi/tests/multi #849 - @dependabot chore(deps): bump flask from 1.1.4 to 2.2.2 in /buildpacks/buildpack-python/tests/python-flask #850 - @dependabot chore(deps): bump actions/setup-python from 2 to 4 #852 - @dependabot chore(deps): bump sinatra from 1.4.2 to 1.4.8 in /buildpacks/buildpack-multi/tests/multi #853 - @dependabot chore(deps): bump markupsafe from 2.0.1 to 2.1.2 in /buildpacks/buildpack-python/tests/python-flask #854 - @dependabot chore(deps): bump flask from 1.1.4 to 2.2.2 in /buildpacks/buildpack-multi/tests/multi #856 - @dependabot chore(deps): bump silex/silex from 2.0.4 to 2.3.0 in /buildpacks/buildpack-php/tests/php #857 - @dependabot chore(deps): bump monolog/monolog from 1.22.1 to 2.9.1 in /buildpacks/buildpack-php/tests/php #858 - @dependabot chore(deps-dev): bump rack-test from 0.6.3 to 2.0.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #859 - @dependabot chore(deps): bump golang from 1.17 to 1.20 #860 - @dependabot chore(deps): bump symfony/twig-bridge from 3.2.7 to 5.2.12 in /buildpacks/buildpack-php/tests/php #861 - @dependabot chore(deps): bump twig/twig from 2.15.4 to 3.5.1 in /buildpacks/buildpack-php/tests/php #862 - @dependabot chore(deps): bump puma from 6.0.2 to 6.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #863 - @dependabot chore(deps): bump sinatra from 1.4.8 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #864 - @dependabot chore(deps): bump rack from 1.6.13 to 3.0.4.1 in /buildpacks/buildpack-multi/tests/multi #865 - @dependabot chore(deps-dev): bump heroku/heroku-buildpack-php from 230 to 231 in /buildpacks/buildpack-php/tests/php #866 - @dependabot chore(deps): bump flask from 2.2.2 to 2.2.3 in /buildpacks/buildpack-python/tests/python-flask #867 - @dependabot chore(deps): bump flask from 2.2.2 to 2.2.3 in /buildpacks/buildpack-multi/tests/multi #868 - @dependabot Update python to version v225 #869 - @dependabot Update ruby to version v252 #870 - @josegonzalez Fix releases #816 - @josegonzalez Update github workflows to use latest builder #826 - @josegonzalez Update go to version v171 #825 - @josegonzalez Update gradle to version v39 #821 - @josegonzalez Update nodejs to version v203 #873 - @josegonzalez Update php to version v230 #824 - @josegonzalez Update php to version v231 #871 - @josegonzalez Update python to version v224 #820 - @josegonzalez Update python to version v226 #872 - @josegonzalez Update ruby to version v245 #817 - @josegonzalez Update ruby to version v250 #819 - @josegonzalez Update ruby to version v251 #823 --- CHANGELOG.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 55 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ba741d675..2a9ea4d83 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,58 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.41](https://github.com/gliderlabs/herokuish/compare/v0.5.40...v0.5.41) - 2023-02-17 + +- @dependabot chore(deps): bump docker/login-action from 1 to 2 #829 +- @dependabot chore(deps): bump maven-compiler-plugin from 2.3.2 to 3.10.1 in /buildpacks/buildpack-java/tests/java-jetty #830 +- @dependabot chore(deps-dev): bump heroku/heroku-buildpack-php from 121 to 230 in /buildpacks/buildpack-php/tests/php #831 +- @dependabot chore(deps): bump actions/checkout from 2 to 3 #832 +- @dependabot chore(deps): bump gopkg.in/yaml.v2 from 2.2.8 to 2.4.0 #833 +- @dependabot chore(deps): bump maven-dependency-plugin from 2.4 to 3.5.0 in /buildpacks/buildpack-java/tests/java-jetty #834 +- @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-multi/tests/multi #835 +- @dependabot chore(deps): bump express from 3.1.2 to 4.18.2 in /buildpacks/buildpack-nodejs/tests/nodejs-express #836 +- @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-python/tests/python-flask #837 +- @dependabot chore(deps): bump actions/download-artifact from 1 to 3 #838 +- @dependabot chore(deps): bump express from 3.1.2 to 4.18.2 in /buildpacks/buildpack-multi/tests/multi #839 +- @dependabot chore(deps): bump rack from 1.6.12 to 1.6.13 in /buildpacks/buildpack-multi/tests/multi #841 +- @dependabot chore(deps): bump actions/upload-artifact from 2 to 3 #842 +- @dependabot chore(deps): bump jinja2 from 2.11.3 to 3.1.2 in /buildpacks/buildpack-python/tests/python-flask #844 +- @dependabot chore(deps): bump jinja2 from 2.11.3 to 3.1.2 in /buildpacks/buildpack-multi/tests/multi #845 +- @dependabot chore(deps): bump actions/setup-go from 2 to 3 #847 +- @dependabot chore(deps): bump gunicorn from 19.5.0 to 20.1.0 in /buildpacks/buildpack-python/tests/python-django #848 +- @dependabot chore(deps): bump markupsafe from 2.0.1 to 2.1.2 in /buildpacks/buildpack-multi/tests/multi #849 +- @dependabot chore(deps): bump flask from 1.1.4 to 2.2.2 in /buildpacks/buildpack-python/tests/python-flask #850 +- @dependabot chore(deps): bump actions/setup-python from 2 to 4 #852 +- @dependabot chore(deps): bump sinatra from 1.4.2 to 1.4.8 in /buildpacks/buildpack-multi/tests/multi #853 +- @dependabot chore(deps): bump markupsafe from 2.0.1 to 2.1.2 in /buildpacks/buildpack-python/tests/python-flask #854 +- @dependabot chore(deps): bump flask from 1.1.4 to 2.2.2 in /buildpacks/buildpack-multi/tests/multi #856 +- @dependabot chore(deps): bump silex/silex from 2.0.4 to 2.3.0 in /buildpacks/buildpack-php/tests/php #857 +- @dependabot chore(deps): bump monolog/monolog from 1.22.1 to 2.9.1 in /buildpacks/buildpack-php/tests/php #858 +- @dependabot chore(deps-dev): bump rack-test from 0.6.3 to 2.0.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #859 +- @dependabot chore(deps): bump golang from 1.17 to 1.20 #860 +- @dependabot chore(deps): bump symfony/twig-bridge from 3.2.7 to 5.2.12 in /buildpacks/buildpack-php/tests/php #861 +- @dependabot chore(deps): bump twig/twig from 2.15.4 to 3.5.1 in /buildpacks/buildpack-php/tests/php #862 +- @dependabot chore(deps): bump puma from 6.0.2 to 6.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #863 +- @dependabot chore(deps): bump sinatra from 1.4.8 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #864 +- @dependabot chore(deps): bump rack from 1.6.13 to 3.0.4.1 in /buildpacks/buildpack-multi/tests/multi #865 +- @dependabot chore(deps-dev): bump heroku/heroku-buildpack-php from 230 to 231 in /buildpacks/buildpack-php/tests/php #866 +- @dependabot chore(deps): bump flask from 2.2.2 to 2.2.3 in /buildpacks/buildpack-python/tests/python-flask #867 +- @dependabot chore(deps): bump flask from 2.2.2 to 2.2.3 in /buildpacks/buildpack-multi/tests/multi #868 +- @dependabot Update python to version v225 #869 +- @dependabot Update ruby to version v252 #870 +- @josegonzalez Fix releases #816 +- @josegonzalez Update github workflows to use latest builder #826 +- @josegonzalez Update go to version v171 #825 +- @josegonzalez Update gradle to version v39 #821 +- @josegonzalez Update nodejs to version v203 #873 +- @josegonzalez Update php to version v230 #824 +- @josegonzalez Update php to version v231 #871 +- @josegonzalez Update python to version v224 #820 +- @josegonzalez Update python to version v226 #872 +- @josegonzalez Update ruby to version v245 #817 +- @josegonzalez Update ruby to version v250 #819 +- @josegonzalez Update ruby to version v251 #823 + ## [0.5.40](https://github.com/gliderlabs/herokuish/compare/v0.5.39...v0.5.40) - 2021-11-15 - @josegonzalez Update python to version v223 #809 diff --git a/Makefile b/Makefile index 4f6e54f63..e8370bb70 100644 --- 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.40 +VERSION ?= 0.5.41 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index ce88f6eac..255b36333 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.40-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.41-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.40/herokuish_0.5.40_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.41/herokuish_0.5.41_linux_x86_64.tgz \ | tar -xzC /bin ``` From 47b1ced6234809ea23d79c298f2a47b91a89a0b4 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Fri, 17 Feb 2023 14:55:52 -0500 Subject: [PATCH 188/871] fix: add missing dependency --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e8370bb70..4fd1197b5 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ endif build/deb: mkdir -p build/deb -build/deb/$(NAME)_$(VERSION)_all.deb: build/deb +build/deb/$(NAME)_$(VERSION)_all.deb: build/deb fpm echo $(VERSION) > /tmp/$(NAME)-VERSION fpm \ --after-install contrib/post-install \ @@ -97,7 +97,7 @@ build/deb/$(NAME)_$(VERSION)_all.deb: build/deb build/rpm: mkdir -p build/rpm -build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/rpm +build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/rpm fpm echo $(VERSION) > /tmp/$(NAME)-VERSION fpm \ --after-install contrib/post-install \ From 63404169d2edc1b653ffaf677541dea6411cf231 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Fri, 17 Feb 2023 16:15:14 -0500 Subject: [PATCH 189/871] debug: check what files exist --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 4fd1197b5..e08faac64 100644 --- a/Makefile +++ b/Makefile @@ -170,6 +170,7 @@ lint: shellcheck -e SC2002,SC2030,SC2031,SC2034,SC2206,SC2001,SC2231,SC2230 -s bash include/*.bash tests/**/tests.sh release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_all.deb bin/gh-release bin/gh-release-body + ls -lah build build/* || true 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 From 172d4c541fa1ea82b9f3115cf9e0cb4f2586ffde Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 20 Feb 2023 19:50:29 -0500 Subject: [PATCH 190/871] fix: ensure the build folder is properly uploaded and downloaded Without this, we come into cases where the folder might have partial information due to which test creates the artifacts. --- .github/workflows/main.yml | 41 ++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fec9106ba..a285b4cbe 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,18 +17,18 @@ concurrency: jobs: build: - name: build.${{ matrix.make }} + name: build.${{ matrix.heroku }}-${{ matrix.buildx }} runs-on: ubuntu-20.04 strategy: fail-fast: true matrix: - make: - - build/docker/18 STACK_VERSION=18 - - build/docker/20 STACK_VERSION=20 - - build/docker/22 STACK_VERSION=22 - - build build/docker/18 BUILDX=false STACK_VERSION=18 - - build build/docker/20 BUILDX=false STACK_VERSION=20 - - build build/docker/22 BUILDX=false STACK_VERSION=22 + buildx: + - "true" + - "false" + heroku: + - 18 + - 20 + - 22 steps: - uses: actions/checkout@v3 @@ -75,18 +75,23 @@ jobs: echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: build - run: make ${{ matrix.make }} + run: | + if [[ "${{ matrix.buildx }}" == "true" ]]; then + make build/docker/${{ matrix.heroku }} STACK_VERSION=${{ matrix.heroku }} + else + make build build/docker/${{ matrix.heroku }} BUILDX=false STACK_VERSION=${{ matrix.heroku }} + fi - name: bash tests run: | - if [[ "${{ matrix.make }}" =~ *BUILDX* ]]; then + if [[ "${{ matrix.buildx }}" == "false" ]]; then basht tests/**/tests.sh fi - name: upload packages uses: actions/upload-artifact@v3 with: - name: build + name: build-${{ matrix.heroku }}-${{ matrix.buildx }} path: build @@ -126,7 +131,12 @@ jobs: - name: download packages uses: actions/download-artifact@v3 with: - name: build + name: build-${{ matrix.heroku }}-true + path: build + + - name: validate packages + run: | + ls -lah build build/* - name: install requirements run: make deps @@ -154,7 +164,12 @@ jobs: - name: download packages uses: actions/download-artifact@v3 with: - name: build + name: build-22-true + path: build + + - name: validate packages + run: | + ls -lah build build/* - name: Login to DockerHub if: github.event_name != 'pull_request' From e102beab199fcfe62e6bf588c24516766bd2f495 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Mon, 20 Feb 2023 20:32:41 -0500 Subject: [PATCH 191/871] fix: download correct files The buildx version is empty, likely due to the image not being loaded to the local docker... --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a285b4cbe..eae437d11 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -131,7 +131,7 @@ jobs: - name: download packages uses: actions/download-artifact@v3 with: - name: build-${{ matrix.heroku }}-true + name: build-${{ matrix.heroku }}-false path: build - name: validate packages @@ -164,7 +164,7 @@ jobs: - name: download packages uses: actions/download-artifact@v3 with: - name: build-22-true + name: build-22-false path: build - name: validate packages From 9382270cad080524a4330736e3dc92940ec68dbe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 24 Feb 2023 11:28:47 +0000 Subject: [PATCH 192/871] chore(deps): bump github.com/progrium/go-basher Bumps [github.com/progrium/go-basher](https://github.com/progrium/go-basher) from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible. - [Release notes](https://github.com/progrium/go-basher/releases) - [Commits](https://github.com/progrium/go-basher/commits/v5.1.6) --- updated-dependencies: - dependency-name: github.com/progrium/go-basher dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ed6fc5419..21169fde4 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module herokuish go 1.17 require ( - github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 + github.com/progrium/go-basher v5.1.6+incompatible gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 09b5eda76..9a20906f0 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1 h1:pNf4kIAZbE5uKZ1tZAEXOvDcO7+32PeMOlAl85E8UU4= -github.com/progrium/go-basher v0.0.0-20190315062444-ad5de635edd1/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= +github.com/progrium/go-basher v5.1.6+incompatible h1:4C9YrvISyUN01W2gEruN1EzMecc75NDiHUjipKuOqls= +github.com/progrium/go-basher v5.1.6+incompatible/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From b0a0c94dc5c9a61ece5b1862d6d92f34010d9c94 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 27 Feb 2023 12:16:49 +0000 Subject: [PATCH 193/871] chore(deps): bump maven-compiler-plugin Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index e2b86251d..1751ae878 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -34,7 +34,7 @@ maven-compiler-plugin - 3.10.1 + 3.11.0 1.6 1.6 From d3702201766016aa5992804e5b7912b3d035192a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Mar 2023 11:56:37 +0000 Subject: [PATCH 194/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.4.1 to 3.0.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.4.1...v3.0.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 58f8617da..a7e1b60cd 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,7 +1,7 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.4.1) + rack (3.0.7) sinatra (1.0) rack (>= 1.0) From b1fdbd88f2688b02eb2aaf212b9a668520d8798d Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sat, 18 Mar 2023 01:13:29 -0400 Subject: [PATCH 195/871] chore: debug bin dir as well --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index eae437d11..f6dfb0b47 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -169,7 +169,7 @@ jobs: - name: validate packages run: | - ls -lah build build/* + ls -lah build build/* bin/* - name: Login to DockerHub if: github.event_name != 'pull_request' From 874362480d3102461b2566df08d0aa912e148f29 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sat, 18 Mar 2023 14:40:37 -0400 Subject: [PATCH 196/871] fix: force remove the built files This shouldn't matter as the targets aren't PHONY, but releases won't work without this, so instead of messing with that, simply force-delete the files if they exist. --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index e08faac64..d81a2244b 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,7 @@ build/deb: mkdir -p build/deb build/deb/$(NAME)_$(VERSION)_all.deb: build/deb fpm + rm -f build/deb/$(NAME)_$(VERSION)_all.deb echo $(VERSION) > /tmp/$(NAME)-VERSION fpm \ --after-install contrib/post-install \ @@ -98,6 +99,7 @@ build/rpm: mkdir -p build/rpm build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm: build/rpm fpm + rm -f build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm echo $(VERSION) > /tmp/$(NAME)-VERSION fpm \ --after-install contrib/post-install \ From 45573ebbb9dcb1883c9487e2268c3642c2e142e4 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 04:47:40 -0400 Subject: [PATCH 197/871] fix: ensure go-bindata is available --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d81a2244b..6ea3fdea7 100644 --- a/Makefile +++ b/Makefile @@ -38,7 +38,7 @@ ifeq ($(SYSTEM),Linux) command -v package_cloud >/dev/null || gem install package_cloud --no-document endif -bindata.go: +bindata.go: go-bindata @count=0; \ for i in $(BUILDPACK_ORDER); do \ bp_count=$$(printf '%02d' $$count) ; \ @@ -126,15 +126,17 @@ clean: docker rm $(shell docker ps -aq) || true docker rmi herokuish:dev || true -deps: +deps: bindata.go docker pull heroku/heroku:18-build docker pull heroku/heroku:20-build docker pull heroku/heroku:22-build - cd / && go get -u github.com/jteeuwen/go-bindata/... cd / && go get -u github.com/progrium/basht/... $(MAKE) bindata.go go get || true +go-bindata: + cd / && go get -u github.com/jteeuwen/go-bindata/... + bin/gh-release: mkdir -p bin curl -o bin/gh-release.tgz -sL https://github.com/progrium/gh-release/releases/download/v2.3.3/gh-release_2.3.3_$(SYSTEM_NAME)_$(HARDWARE).tgz From cba35daf6ca5162640f84443ddfff88a7e5d8c67 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 16:44:33 -0400 Subject: [PATCH 198/871] fix: use newer method to install go-bindata binary --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6ea3fdea7..c7eedc4e5 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ deps: bindata.go go get || true go-bindata: - cd / && go get -u github.com/jteeuwen/go-bindata/... + cd / && go install github.com/jteeuwen/go-bindata/go-bindata@latest bin/gh-release: mkdir -p bin From 026e1a35e6c78bea6477aca59065c24f905f16c6 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 20:20:17 -0400 Subject: [PATCH 199/871] chore: log where go-bindata is being installed --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index c7eedc4e5..dd72d0527 100644 --- a/Makefile +++ b/Makefile @@ -135,7 +135,7 @@ deps: bindata.go go get || true go-bindata: - cd / && go install github.com/jteeuwen/go-bindata/go-bindata@latest + cd / && go install -v -x -a github.com/jteeuwen/go-bindata/go-bindata@latest bin/gh-release: mkdir -p bin From 13b5998201ad083877345dc82becbefb3aa7037e Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 21:32:29 -0400 Subject: [PATCH 200/871] fix: add go bin path to runner path --- .github/workflows/release.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c407a8a11..d65b48fe2 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,4 +50,6 @@ jobs: echo "Platforms: ${{ steps.buildx.outputs.platforms }}" - name: Build herokuish - run: make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" + run: | + export PATH="/home/runner/go/bin:$PATH" + make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" From 9c96cdbf1b9effa00f3a66925acc5c476a704b63 Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 21:33:55 -0400 Subject: [PATCH 201/871] fix: add STACK_VERSION so we build each sub-image correctly --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d65b48fe2..b531bef97 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,4 +52,4 @@ jobs: - name: Build herokuish run: | export PATH="/home/runner/go/bin:$PATH" - make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" + make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" STACK_VERSION=${{ matrix.heroku }} From 34906a81fb7ea71fa3fcdaf565c7813ab9378e1c Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Sun, 19 Mar 2023 22:42:01 -0400 Subject: [PATCH 202/871] fix: use correct variable for github repository ame --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b531bef97..ba8ea2e59 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -52,4 +52,4 @@ jobs: - name: Build herokuish run: | export PATH="/home/runner/go/bin:$PATH" - make build/docker/${{ matrix.heroku }} IMAGE_NAME=${{ env.GITHUB_REPOSITORY }} BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" STACK_VERSION=${{ matrix.heroku }} + make build/docker/${{ matrix.heroku }} IMAGE_NAME="$GITHUB_REPOSITORY" BUILD_TAG=${{ steps.get_version.outputs.VERSION }} VERSION=${{ steps.get_version.outputs.VERSION }} DOCKER_ARGS="--push" STACK_VERSION=${{ matrix.heroku }} From 16461f1f1a3d18afd3c2fd8286e9e70085c0b4e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 02:42:43 +0000 Subject: [PATCH 203/871] chore(deps): bump actions/setup-go from 3 to 4 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 3 to 4. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f6dfb0b47..4b13c3e2b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -35,7 +35,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.17.8 @@ -124,7 +124,7 @@ jobs: steps: - uses: actions/checkout@v3 - - uses: actions/setup-go@v3 + - uses: actions/setup-go@v4 with: go-version: 1.17.8 From 24a321459b0874b9346f517077703444b2ba5bc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 05:26:35 +0000 Subject: [PATCH 204/871] chore(deps-dev): bump rack-test Bumps [rack-test](https://github.com/rack/rack-test) from 2.0.2 to 2.1.0. - [Release notes](https://github.com/rack/rack-test/releases) - [Changelog](https://github.com/rack/rack-test/blob/main/History.md) - [Commits](https://github.com/rack/rack-test/compare/v2.0.2...v2.1.0) --- updated-dependencies: - dependency-name: rack-test dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 14340dee6..e62234325 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -10,7 +10,7 @@ GEM rack (2.2.6.2) rack-protection (3.0.5) rack - rack-test (2.0.2) + rack-test (2.1.0) rack (>= 1.3) rake (13.0.6) ruby2_keywords (0.0.5) From 5fd682cb8ab6c2a351e0c4bb2b171a66b2b0885d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 05:26:49 +0000 Subject: [PATCH 205/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.1.0 to 6.1.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.1.0...v6.1.1) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 14340dee6..8c309606c 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -5,7 +5,7 @@ GEM ruby2_keywords (~> 0.0.1) nio4r (2.5.8) power_assert (2.0.3) - puma (6.1.0) + puma (6.1.1) nio4r (~> 2.0) rack (2.2.6.2) rack-protection (3.0.5) From ab1f58acb6ef9cfe8b387b75714a4e581517fe03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 05:27:53 +0000 Subject: [PATCH 206/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 2.2.6.2 to 2.2.6.4. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.2...v2.2.6.4) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 7f3245172..9b2ba7d38 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -7,7 +7,7 @@ GEM power_assert (2.0.3) puma (6.1.1) nio4r (~> 2.0) - rack (2.2.6.2) + rack (2.2.6.4) rack-protection (3.0.5) rack rack-test (2.1.0) From 6a46b62e59deb8ea365f3ee4db7262d37ef664b0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 05:29:57 +0000 Subject: [PATCH 207/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.5. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/master/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.5) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index a7e1b60cd..cf49b2683 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.7) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.6.4) + rack-protection (3.0.5) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) + tilt (~> 2.0) + tilt (2.1.0) PLATFORMS ruby From 89e231e55e1ff3e8cbc1c189f5aafb17d8ebeeb3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 20 Mar 2023 01:31:18 -0400 Subject: [PATCH 208/871] Update python to version v229 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 3e1126dc8..eee5679ff 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v226 +v229 From 1d6bf6a3ab122ddae0dd5463abac3662b9e19065 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 20 Mar 2023 01:31:18 -0400 Subject: [PATCH 209/871] Update nodejs to version v205 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index c8821497c..82eb703eb 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v203 +v205 From da77cdeff694ce535fc6eaf5864d960efe75509a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Mar 2023 11:56:41 +0000 Subject: [PATCH 210/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.6.4 to 3.0.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.4...v3.0.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index cf49b2683..a7e1b60cd 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.6.4) - rack-protection (3.0.5) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.5) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) - tilt (~> 2.0) - tilt (2.1.0) + rack (3.0.7) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 7bbe29c6c1c6b914a15552e7adc0419d23b5b76b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 11:56:37 +0000 Subject: [PATCH 211/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.5. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.5) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index a7e1b60cd..cf49b2683 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.7) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.6.4) + rack-protection (3.0.5) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.5) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.5) + tilt (~> 2.0) + tilt (2.1.0) PLATFORMS ruby From 2e417cf6cda8ec3fde55f82dcae22a32f41a73f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Apr 2023 11:56:35 +0000 Subject: [PATCH 212/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.5...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index cf49b2683..a1bced4b0 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,13 +4,13 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) rack (2.2.6.4) - rack-protection (3.0.5) + rack-protection (3.0.6) rack ruby2_keywords (0.0.5) - sinatra (3.0.5) + sinatra (3.0.6) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) + rack-protection (= 3.0.6) tilt (~> 2.0) tilt (2.1.0) From a3998473d8f6894e775f66bffda8015eef4deeee Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 18 Apr 2023 11:56:31 +0000 Subject: [PATCH 213/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.1.1 to 6.2.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.1.1...v6.2.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 9b2ba7d38..b3cc86cb7 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -3,9 +3,9 @@ GEM specs: mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - nio4r (2.5.8) + nio4r (2.5.9) power_assert (2.0.3) - puma (6.1.1) + puma (6.2.2) nio4r (~> 2.0) rack (2.2.6.4) rack-protection (3.0.5) From ea9687ec6b75062f0fe39faed62aa4ce6ba33501 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:56:29 +0000 Subject: [PATCH 214/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 2.2.6.4 to 2.2.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.4...v2.2.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 9b2ba7d38..3a13c52d9 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -7,7 +7,7 @@ GEM power_assert (2.0.3) puma (6.1.1) nio4r (~> 2.0) - rack (2.2.6.4) + rack (2.2.7) rack-protection (3.0.5) rack rack-test (2.1.0) From 7570ccb7e0cbdff912caacbe008f73247bc2e109 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 00:25:03 +0000 Subject: [PATCH 215/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 2.2.3 to 2.3.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.2.3...2.3.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index b50afb77a..07c4818d9 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.2.3 +Flask==2.3.2 Jinja2==3.1.2 gunicorn==20.1.0 markupsafe==2.1.2 From 87c1ab555b094eeb44c709d9cd36aa5d8514a8f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 May 2023 00:25:11 +0000 Subject: [PATCH 216/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 2.2.3 to 2.3.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.2.3...2.3.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index b50afb77a..07c4818d9 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.2.3 +Flask==2.3.2 Jinja2==3.1.2 gunicorn==20.1.0 markupsafe==2.1.2 From 5781c1122bb6662e8225f8d7b53bc1f929caf3ba Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 4 May 2023 11:56:47 +0000 Subject: [PATCH 217/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.5.1 to 3.6.0. - [Release notes](https://github.com/twigphp/Twig/releases) - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.5.1...v3.6.0) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 583f18151..9258b7218 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2008,16 +2008,16 @@ }, { "name": "twig/twig", - "version": "v3.5.1", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15" + "reference": "106c170d08e8415d78be2d16c3d057d0d108262b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a6e0510cc793912b451fd40ab983a1d28f611c15", - "reference": "a6e0510cc793912b451fd40ab983a1d28f611c15", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/106c170d08e8415d78be2d16c3d057d0d108262b", + "reference": "106c170d08e8415d78be2d16c3d057d0d108262b", "shasum": "" }, "require": { @@ -2026,15 +2026,10 @@ "symfony/polyfill-mbstring": "^1.3" }, "require-dev": { - "psr/container": "^1.0", + "psr/container": "^1.0|^2.0", "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.5-dev" - } - }, "autoload": { "psr-4": { "Twig\\": "src/" @@ -2068,7 +2063,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.5.1" + "source": "https://github.com/twigphp/Twig/tree/v3.6.0" }, "funding": [ { @@ -2080,7 +2075,7 @@ "type": "tidelift" } ], - "time": "2023-02-08T07:49:20+00:00" + "time": "2023-05-03T19:06:57+00:00" } ], "packages-dev": [ From cc1ac28c1ea59634acf85a662e2c081c50483c1f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 23 May 2023 12:03:06 +0000 Subject: [PATCH 218/871] chore(deps): bump maven-dependency-plugin Bumps [maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.5.0 to 3.6.0. - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.5.0...maven-dependency-plugin-3.6.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index 1751ae878..51c009ae6 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.5.0 + 3.6.0 copy-dependencies From 92c7325480dbe9aa9701a8eb76c3280258010287 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 11:56:50 +0000 Subject: [PATCH 219/871] chore(deps-dev): bump test-unit Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.7 to 3.5.9. - [Release notes](https://github.com/test-unit/test-unit/releases) - [Commits](https://github.com/test-unit/test-unit/compare/3.5.7...3.5.9) --- updated-dependencies: - dependency-name: test-unit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 9b2ba7d38..2a4eb522e 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -19,7 +19,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.0.5) tilt (~> 2.0) - test-unit (3.5.7) + test-unit (3.5.9) power_assert tilt (2.0.11) From d1c3b8a3ce4a27535808a6486f1b5a933e24158c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 20:15:32 +0000 Subject: [PATCH 220/871] chore(deps): bump sinatra Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.5 to 3.0.6. - [Release notes](https://github.com/sinatra/sinatra/releases) - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.5...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index d04a2c0e7..74cc30939 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,20 +8,20 @@ GEM puma (6.2.2) nio4r (~> 2.0) rack (2.2.7) - rack-protection (3.0.5) + rack-protection (3.0.6) rack rack-test (2.1.0) rack (>= 1.3) rake (13.0.6) ruby2_keywords (0.0.5) - sinatra (3.0.5) + sinatra (3.0.6) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.5) + rack-protection (= 3.0.6) tilt (~> 2.0) test-unit (3.5.9) power_assert - tilt (2.0.11) + tilt (2.1.0) PLATFORMS ruby From 1ef76d4b884e8de83959db7b09cfc5d398543d12 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 25 May 2023 20:15:32 +0000 Subject: [PATCH 221/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.6.4 to 2.2.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.6.4...v2.2.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index a1bced4b0..9d24e2e94 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -3,7 +3,7 @@ GEM specs: mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (2.2.6.4) + rack (2.2.7) rack-protection (3.0.6) rack ruby2_keywords (0.0.5) From 296d87e724746a5987466a2dca2c0b6a773f40f3 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 16:26:54 -0400 Subject: [PATCH 222/871] chore: drop all references to circleci Herokuish uses Github Actions for CI now. --- .circleci/config.yml | 71 -------------------------------------------- Dockerfile | 1 - README.md | 2 +- 3 files changed, 1 insertion(+), 73 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 830f75c24..000000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,71 +0,0 @@ -version: 2 -jobs: - workflow: - machine: true - working_directory: ~/gliderlabs/herokuish - parallelism: 4 - steps: - - checkout - - run: | - case $CIRCLE_NODE_INDEX in 0) make shellcheck;; esac - - run: | - case $CIRCLE_NODE_INDEX in 0) make lint;; esac - - run: | - make ci-report - - run: | - make deps fpm package_cloud - - run: | - make build - - run: | - case $CIRCLE_NODE_INDEX in 0) basht tests/**/tests.sh ;; esac - - run: | - tests=$(circleci tests glob buildpacks/*/tests/*/test.sh | circleci tests split --split-by=timings | xargs) - echo "executing tests: $tests" - basht $tests - - store_artifacts: - path: build - destination: build - - deploy: - name: release - command: | - if [ "${CIRCLE_BRANCH}" == "release" ]; then - export PACKAGECLOUD_REPOSITORY=dokku/dokku - make release release-packagecloud - fi - release-workflow: - machine: true - working_directory: ~/gliderlabs/herokuish - steps: - - checkout - - run: | - echo "$DOCKERHUB_PASSWORD" | docker login --username "$DOCKERHUB_USERNAME" --password-stdin - - run: | - docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest --build-arg STACK_VERSION=18 . - - run: | - docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 --build-arg STACK_VERSION=20 . - - run: | - docker image build -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 -t $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 --build-arg STACK_VERSION=22 . - - run: | - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-18 - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-18 - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest - - run: | - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-20 - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-20 - - run: | - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:$CIRCLE_TAG-22 - docker image push $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME:latest-22 - -workflows: - version: 2 - workflow: - jobs: - - workflow - release-workflow: - jobs: - - release-workflow: - filters: - branches: - ignore: /.*/ - tags: - only: /^v.*/ diff --git a/Dockerfile b/Dockerfile index 0c3b9f8f8..58f2bcb8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -45,7 +45,6 @@ RUN /bin/herokuish buildpack install \ && rm -rf \ */.git \ */.github \ - */.circleci \ */changelogs \ */spec \ */support/build \ diff --git a/README.md b/README.md index 255b36333..4e9588397 100644 --- a/README.md +++ b/README.md @@ -207,7 +207,7 @@ For help and discussion beyond Github Issues, join us on Freenode in `#gliderlab ## Releases -Anybody can propose a release. First bump the version in `Makefile` and `Dockerfile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, CircleCI will build a release and upload it to Github. +Anybody can propose a release. First bump the version in `Makefile` and `Dockerfile`, make sure `CHANGELOG.md` is up to date, and make sure tests are passing. Then open a Pull Request from `master` into the `release` branch. Once a maintainer approves and merges, Github Actions will build a release and upload it to Github. ## Acknowledgements From a5721c331956224b944c6116e8abbfaa5471e015 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 17:30:48 -0400 Subject: [PATCH 223/871] chore: split out actions workflows This ensures the release tagging workflow _only_ ever gets run when we've actually merged to the release branch, vs every time. --- .github/workflows/main.yml | 42 ------------------------------- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 42 +++++++++++++++++++++++++++++++ 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 .github/workflows/tag-release.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b13c3e2b..8291484fa 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -9,7 +9,6 @@ on: push: branches: - master - - 'release' concurrency: group: build-${{ github.event.pull_request.number || github.ref }} @@ -94,7 +93,6 @@ jobs: name: build-${{ matrix.heroku }}-${{ matrix.buildx }} path: build - unit-tests: name: unit.heroku-${{ matrix.heroku }}.${{ matrix.buildpack }} needs: build @@ -148,43 +146,3 @@ jobs: run: | echo "executing ${{ matrix.buildpack }} tests" basht buildpacks/${{ matrix.buildpack }}/tests/*/test.sh - - release: - name: release - needs: unit-tests - runs-on: ubuntu-20.04 - - steps: - - uses: actions/checkout@v3 - - - uses: ruby/setup-ruby@v1 - with: - ruby-version: 2.6 - - - name: download packages - uses: actions/download-artifact@v3 - with: - name: build-22-false - path: build - - - name: validate packages - run: | - ls -lah build build/* bin/* - - - name: Login to DockerHub - if: github.event_name != 'pull_request' - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: release - run: | - if [[ "${GITHUB_REF#refs/heads/}" == "release" ]]; then - export CI_BRANCH=${GITHUB_REF#refs/heads/} - export PACKAGECLOUD_REPOSITORY=dokku/dokku - make release release-packagecloud - fi - env: - GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} - PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba8ea2e59..81dea4a2f 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ on: jobs: build: - name: build + name: release runs-on: ubuntu-20.04 strategy: fail-fast: false diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml new file mode 100644 index 000000000..1b92dbd1c --- /dev/null +++ b/.github/workflows/tag-release.yml @@ -0,0 +1,42 @@ +--- +name: tag release + +# yamllint disable-line rule:truthy +on: + push: + branches: + - 'release' + +jobs: + tag-release: + name: tag-release + runs-on: ubuntu-20.04 + + steps: + - uses: actions/checkout@v3 + + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + - name: download packages + uses: actions/download-artifact@v3 + with: + name: build-22-false + path: build + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: release + run: | + export CI_BRANCH=${GITHUB_REF#refs/heads/} + export PACKAGECLOUD_REPOSITORY=dokku/dokku + make release release-packagecloud + env: + GITHUB_ACCESS_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} + PACKAGECLOUD_TOKEN: ${{ secrets.PACKAGECLOUD_TOKEN }} From a1e389693b9df1ea6f848941e739d0507bc33cd8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 17:50:09 -0400 Subject: [PATCH 224/871] chore: drop Ubuntu 18 This will be unsupported at the end of the month, so we're dropping support ahead of that since builds won't work at that time. --- .github/workflows/main.yml | 2 -- .github/workflows/release.yml | 1 - Dockerfile | 4 ++-- Makefile | 6 ++---- README.md | 2 +- bin/setup.sh | 4 ++-- contrib/post-install | 2 -- include/buildpack.bash | 2 +- 8 files changed, 8 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4b13c3e2b..69ba62528 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -26,7 +26,6 @@ jobs: - "true" - "false" heroku: - - 18 - 20 - 22 @@ -117,7 +116,6 @@ jobs: - buildpack-scala - buildpack-static heroku: - - 18 - 20 - 22 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba8ea2e59..4a8cf136e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,7 +15,6 @@ jobs: fail-fast: false matrix: heroku: - - 18 - 20 - 22 diff --git a/Dockerfile b/Dockerfile index 58f2bcb8b..22d5fd49f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # syntax=docker/dockerfile:1 -ARG STACK_VERSION=18 +ARG STACK_VERSION=20 FROM golang:1.20 AS builder RUN mkdir /src @@ -10,7 +10,7 @@ ARG VERSION RUN go build -a -ldflags "-X main.Version=$VERSION" -o herokuish . FROM ubuntu:${STACK_VERSION}.04 AS base -ARG STACK_VERSION=18 +ARG STACK_VERSION=20 ARG TARGETARCH ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh diff --git a/Makefile b/Makefile index dd72d0527..1d0af0144 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') DOCKER_ARGS ?= "--pull" BUILDX ?= true -STACK_VERSION ?= 18 +STACK_VERSION ?= 20 shellcheck: ifneq ($(shell shellcheck --version > /dev/null 2>&1 ; echo $$?),0) @@ -55,13 +55,12 @@ build: bindata.go $(MAKE) build/deb/$(NAME)_$(VERSION)_all.deb build/docker: - $(MAKE) build/docker/18 STACK_VERSION=18 $(MAKE) build/docker/20 STACK_VERSION=20 $(MAKE) build/docker/22 STACK_VERSION=22 build/docker/$(STACK_VERSION): bindata.go ifeq ($(BUILDX),true) -ifeq ($(STACK_VERSION),18) +ifeq ($(STACK_VERSION),20) docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . else docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . @@ -127,7 +126,6 @@ clean: docker rmi herokuish:dev || true deps: bindata.go - docker pull heroku/heroku:18-build docker pull heroku/heroku:20-build docker pull heroku/heroku:22-build cd / && go get -u github.com/progrium/basht/... diff --git a/README.md b/README.md index 4e9588397..c863f5595 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ A command line tool for emulating Heroku build and runtime tasks in containers. Herokuish is made for platform authors. The project consolidates and decouples Heroku compatibility logic (running buildpacks, parsing Procfile) and supporting workflow (importing/exporting slugs) from specific platform images like those in Dokku/Buildstep, Deis, Flynn, etc. -The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:18, Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. +The goal is to be the definitive, well maintained and heavily tested Heroku emulation utility shared by all. It is based on the [Heroku:20, and Heroku:22 system images](https://github.com/heroku/stack-images). Together they form a toolkit for achieving Heroku compatibility. Herokuish is a community project and is in no way affiliated with Heroku. diff --git a/bin/setup.sh b/bin/setup.sh index cc9e21bc9..f0be93b39 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -17,7 +17,7 @@ if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then sed -i '/syslinux/d' /tmp/setup-01.sh fi -# Skip unsupported postgresql on arm:18 and arm:20 +# Skip unsupported postgresql on arm:20 if [[ "$TARGETARCH" == "arm" ]]; then sed -i '/postgresql-client-15/d' /tmp/setup-01.sh fi @@ -41,7 +41,7 @@ rm -rf /var/lib/apt/lists/* echo "$setup_02" > /tmp/setup-02.sh chmod +x /tmp/setup-02.sh -# Skip unsupported postgresql on arm:18 and arm:20 +# Skip unsupported postgresql on arm:20 if [[ "$TARGETARCH" == "arm" ]]; then sed -i '/postgresql-server-dev-15/d' /tmp/setup-02.sh fi diff --git a/contrib/post-install b/contrib/post-install index 732439ca0..be22285a5 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -19,9 +19,7 @@ fi VERSION=$(cat /var/lib/herokuish/VERSION) -sudo docker pull "gliderlabs/herokuish:v${VERSION}-18" sudo docker pull "gliderlabs/herokuish:v${VERSION}-20" sudo docker pull "gliderlabs/herokuish:v${VERSION}-22" -sudo docker tag "gliderlabs/herokuish:v${VERSION}-18" gliderlabs/herokuish:latest sudo docker tag "gliderlabs/herokuish:v${VERSION}-20" gliderlabs/herokuish:latest-20 sudo docker tag "gliderlabs/herokuish:v${VERSION}-22" gliderlabs/herokuish:latest-22 diff --git a/include/buildpack.bash b/include/buildpack.bash index e459c3629..f53ddf1a4 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -148,7 +148,7 @@ buildpack-setup() { # shellcheck disable=SC2154 export HOME="$app_path" export REQUEST_ID="build-$RANDOM" - export STACK="${STACK:-heroku-18}" + export STACK="${STACK:-heroku-20}" # build_path defined in outer scope # shellcheck disable=SC2154 cp -r "$app_path/." "$build_path" From 30537b88b16687440c02754aafb2f55a781f9641 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:12 -0400 Subject: [PATCH 225/871] Update nodejs to version v213 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 82eb703eb..2b391c624 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v205 +v213 From fec67755cd0d46d93f31309a0ca063a025ff3ce8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:12 -0400 Subject: [PATCH 226/871] Update ruby to version v254 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 1980255fe..24446d231 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v252 +v254 From 3e7df81f41e2a70dca6c7ae47e25cfc45488cc22 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:13 -0400 Subject: [PATCH 227/871] Update python to version v232 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index eee5679ff..24d0ba759 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v229 +v232 From 37a855fc49d8fdbd8116f587ce03f52c69e0d69c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:14 -0400 Subject: [PATCH 228/871] Update php to version v234 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index df001f256..a049ff44b 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v231 +v234 From 0da42af7bb7da2e2a376367addf2f1a79c7cc933 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:14 -0400 Subject: [PATCH 229/871] Update static to version v23 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 53d1c14db..5502a04f7 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v22 +v23 From 650c3d77c7612da662b5d18eab00740da04d5372 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 25 May 2023 19:19:14 -0400 Subject: [PATCH 230/871] Update go to version v174 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index a567027ae..f76f82076 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v171 +v174 From f40b7bae48d94f0cb50526f49423a855a2769344 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 26 May 2023 01:46:56 -0400 Subject: [PATCH 231/871] Release v0.5.42 - @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 - @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 - @dependabot chore(deps): bump actions/setup-go from 3 to 4 #891 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 - @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 - @dependabot chore(deps): bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /buildpacks/buildpack-java/tests/java-jetty #882 - @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 - @dependabot chore(deps): bump puma from 6.1.0 to 6.1.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #883 - @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 - @dependabot chore(deps): bump rack from 2.2.6.2 to 2.2.6.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #888 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 - @dependabot chore(deps): bump rack from 2.2.6.4 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #903 - @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #904 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi #908 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #909 - @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 - @henningjensen Don't fail in post-install when no dangling images are present #815 - @josegonzalez chore: drop all references to circleci #921 - @josegonzalez chore: split out actions workflows #922 - @josegonzalez Update go to version v174 #928 - @josegonzalez Update nodejs to version v205 #901 - @josegonzalez Update nodejs to version v213 #926 - @josegonzalez Update php to version v234 #924 - @josegonzalez Update python to version v229 #902 - @josegonzalez Update python to version v232 #927 - @josegonzalez Update ruby to version v254 #929 - @josegonzalez Update static to version v23 #925 --- CHANGELOG.md | 34 ++++++++++++++++++++++++++++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2a9ea4d83..6448f86d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,40 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.5.42](https://github.com/gliderlabs/herokuish/compare/v0.5.41...v0.5.42) - 2023-05-26 + +- @dependabot chore(deps): bump actions/setup-go from 3 to 4 #891 +- @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 +- @dependabot chore(deps): bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /buildpacks/buildpack-java/tests/java-jetty #882 +- @dependabot chore(deps): bump puma from 6.1.0 to 6.1.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #883 +- @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 +- @dependabot chore(deps): bump rack from 2.2.6.2 to 2.2.6.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #888 +- @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 +- @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 +- @dependabot chore(deps): bump rack from 2.2.6.4 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #903 +- @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #904 +- @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 +- @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 +- @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 +- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 +- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 +- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 +- @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 +- @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi #908 +- @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #909 +- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 +- @josegonzalez chore: drop all references to circleci #921 +- @josegonzalez chore: split out actions workflows #922 +- @josegonzalez Update go to version v174 #928 +- @josegonzalez Update nodejs to version v205 #901 +- @josegonzalez Update nodejs to version v213 #926 +- @josegonzalez Update php to version v234 #924 +- @josegonzalez Update python to version v229 #902 +- @josegonzalez Update python to version v232 #927 +- @josegonzalez Update ruby to version v254 #929 +- @josegonzalez Update static to version v23 #925 +- @henningjensen Don't fail in post-install when no dangling images are present #815 + ## [0.5.41](https://github.com/gliderlabs/herokuish/compare/v0.5.40...v0.5.41) - 2023-02-17 - @dependabot chore(deps): bump docker/login-action from 1 to 2 #829 diff --git a/Makefile b/Makefile index dd72d0527..6113b66bc 100644 --- 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.41 +VERSION ?= 0.5.42 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 4e9588397..4eb199141 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.41-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.5.42-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.41/herokuish_0.5.41_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.5.42/herokuish_0.5.42_linux_x86_64.tgz \ | tar -xzC /bin ``` From 19637d56b5d4bd4482715b0e3faf0e389786f1bd Mon Sep 17 00:00:00 2001 From: josegonzalez Date: Fri, 26 May 2023 12:49:16 -0400 Subject: [PATCH 232/871] Release v0.5.42 - @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 - @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 - @dependabot chore(deps): bump actions/setup-go from 3 to 4 #891 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 - @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 - @dependabot chore(deps): bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /buildpacks/buildpack-java/tests/java-jetty #882 - @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 - @dependabot chore(deps): bump puma from 6.1.0 to 6.1.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #883 - @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 - @dependabot chore(deps): bump rack from 2.2.6.2 to 2.2.6.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #888 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 - @dependabot chore(deps): bump rack from 2.2.6.4 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #903 - @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #904 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi #908 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #909 - @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 - @henningjensen Don't fail in post-install when no dangling images are present #815 - @josegonzalez chore: drop all references to circleci #921 - @josegonzalez chore: split out actions workflows #922 - @josegonzalez Update go to version v174 #928 - @josegonzalez Update nodejs to version v205 #901 - @josegonzalez Update nodejs to version v213 #926 - @josegonzalez Update php to version v234 #924 - @josegonzalez Update python to version v229 #902 - @josegonzalez Update python to version v232 #927 - @josegonzalez Update ruby to version v254 #929 - @josegonzalez Update static to version v23 #925 - @josegonzalez Partially revert workflow refactor to fix tagging --- .github/workflows/tag-release.yml | 48 +++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 1b92dbd1c..4cba85b8e 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -8,8 +8,56 @@ on: - 'release' jobs: + build: + name: build.${{ matrix.heroku }}-${{ matrix.buildx }} + runs-on: ubuntu-20.04 + strategy: + fail-fast: true + matrix: + buildx: + - "false" + heroku: + - 22 + + steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + + - uses: actions/setup-go@v4 + with: + go-version: 1.17.8 + + - uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.6 + + - name: set up qemu + uses: docker/setup-qemu-action@v2 + + - name: set up docker buildx + uses: docker/setup-buildx-action@v2 + + - uses: actions/setup-python@v4 + with: + python-version: '3.7.x' + + - name: install requirements + run: make deps fpm package_cloud + + - name: build + run: | + make build build/docker/${{ matrix.heroku }} BUILDX=false STACK_VERSION=${{ matrix.heroku }} + + - name: upload packages + uses: actions/upload-artifact@v3 + with: + name: build-${{ matrix.heroku }}-${{ matrix.buildx }} + path: build + tag-release: name: tag-release + needs: build runs-on: ubuntu-20.04 steps: From 85e26cf971bfa1b4d2ef5387608a111ef3c4d983 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 26 May 2023 01:46:56 -0400 Subject: [PATCH 233/871] Release v0.5.42 - @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 - @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 - @dependabot chore(deps): bump actions/setup-go from 3 to 4 #891 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 - @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 - @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 - @dependabot chore(deps): bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /buildpacks/buildpack-java/tests/java-jetty #882 - @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 - @dependabot chore(deps): bump puma from 6.1.0 to 6.1.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #883 - @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 - @dependabot chore(deps): bump rack from 2.2.6.2 to 2.2.6.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #888 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 - @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 - @dependabot chore(deps): bump rack from 2.2.6.4 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #903 - @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #904 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi #908 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #909 - @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 - @henningjensen Don't fail in post-install when no dangling images are present #815 - @josegonzalez chore: drop all references to circleci #921 - @josegonzalez chore: split out actions workflows #922 - @josegonzalez Update go to version v174 #928 - @josegonzalez Update nodejs to version v205 #901 - @josegonzalez Update nodejs to version v213 #926 - @josegonzalez Update php to version v234 #924 - @josegonzalez Update python to version v229 #902 - @josegonzalez Update python to version v232 #927 - @josegonzalez Update ruby to version v254 #929 - @josegonzalez Update static to version v23 #925 --- CHANGELOG.md | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6448f86d3..88d97b915 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,26 +3,27 @@ All notable changes to this project will be documented in this file. ## [0.5.42](https://github.com/gliderlabs/herokuish/compare/v0.5.41...v0.5.42) - 2023-05-26 +- @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 +- @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 - @dependabot chore(deps): bump actions/setup-go from 3 to 4 #891 -- @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 +- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 +- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 +- @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 - @dependabot chore(deps): bump maven-compiler-plugin from 3.10.1 to 3.11.0 in /buildpacks/buildpack-java/tests/java-jetty #882 +- @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 - @dependabot chore(deps): bump puma from 6.1.0 to 6.1.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #883 -- @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 +- @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 - @dependabot chore(deps): bump rack from 2.2.6.2 to 2.2.6.4 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #888 -- @dependabot chore(deps): bump github.com/progrium/go-basher from 0.0.0-20190315062444-ad5de635edd1 to 5.1.6+incompatible #881 -- @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 +- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 +- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 - @dependabot chore(deps): bump rack from 2.2.6.4 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #903 +- @dependabot chore(deps): bump rack from 3.0.4.1 to 3.0.7 in /buildpacks/buildpack-multi/tests/multi #890 +- @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #875 - @dependabot chore(deps): bump sinatra from 1.0 to 3.0.5 in /buildpacks/buildpack-multi/tests/multi #904 -- @dependabot chore(deps-dev): bump test-unit from 3.5.7 to 3.5.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #919 -- @dependabot chore(deps): bump maven-dependency-plugin from 3.5.0 to 3.6.0 in /buildpacks/buildpack-java/tests/java-jetty #918 -- @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 -- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-multi/tests/multi #915 -- @dependabot chore(deps): bump flask from 2.2.3 to 2.3.2 in /buildpacks/buildpack-python/tests/python-flask #914 -- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #911 -- @dependabot chore(deps): bump puma from 6.1.1 to 6.2.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #910 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi #908 - @dependabot chore(deps): bump sinatra from 3.0.5 to 3.0.6 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #909 -- @dependabot chore(deps): bump rack from 2.2.6.4 to 2.2.7 in /buildpacks/buildpack-multi/tests/multi #920 +- @dependabot chore(deps): bump twig/twig from 3.5.1 to 3.6.0 in /buildpacks/buildpack-php/tests/php #916 +- @henningjensen Don't fail in post-install when no dangling images are present #815 - @josegonzalez chore: drop all references to circleci #921 - @josegonzalez chore: split out actions workflows #922 - @josegonzalez Update go to version v174 #928 @@ -33,7 +34,6 @@ All notable changes to this project will be documented in this file. - @josegonzalez Update python to version v232 #927 - @josegonzalez Update ruby to version v254 #929 - @josegonzalez Update static to version v23 #925 -- @henningjensen Don't fail in post-install when no dangling images are present #815 ## [0.5.41](https://github.com/gliderlabs/herokuish/compare/v0.5.40...v0.5.41) - 2023-02-17 From 89aff29aa34d0a43214d4388b9d59a6fd578aa77 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 26 May 2023 13:30:11 -0400 Subject: [PATCH 234/871] Release v0.6.0 - @josegonzalez Drop Ubuntu 18 support #923 --- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 88d97b915..635aeb2d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.6.0](https://github.com/gliderlabs/herokuish/compare/v0.5.42...v0.6.0) - 2023-05-26 + +- @josegonzalez Drop Ubuntu 18 support #923 + ## [0.5.42](https://github.com/gliderlabs/herokuish/compare/v0.5.41...v0.5.42) - 2023-05-26 - @dependabot chore(deps-dev): bump rack-test from 2.0.2 to 2.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra #889 diff --git a/Makefile b/Makefile index fa0c9efae..5f3ae7039 100644 --- 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.42 +VERSION ?= 0.6.0 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 2a83e20b4..58676a67a 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.42-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.6.0-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.42/herokuish_0.5.42_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.6.0/herokuish_0.6.0_linux_x86_64.tgz \ | tar -xzC /bin ``` From 42f8c215d965f487263d7db85b5b20ff3aa5057f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 11:56:45 +0000 Subject: [PATCH 235/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.2.2 to 6.3.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.2.2...v6.3.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 74cc30939..561032833 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -5,7 +5,7 @@ GEM ruby2_keywords (~> 0.0.1) nio4r (2.5.9) power_assert (2.0.3) - puma (6.2.2) + puma (6.3.0) nio4r (~> 2.0) rack (2.2.7) rack-protection (3.0.6) From 8682790278d619988e884cad01407eb35c89af0b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 11:56:28 +0000 Subject: [PATCH 236/871] chore(deps): bump markupsafe Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.2...2.1.3) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 07c4818d9..9220a718f 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==2.3.2 Jinja2==3.1.2 gunicorn==20.1.0 -markupsafe==2.1.2 +markupsafe==2.1.3 From 1edd9e0a76c7136d3b1e2bc8f977f97836dca841 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Jun 2023 15:31:41 +0000 Subject: [PATCH 237/871] chore(deps): bump markupsafe in /buildpacks/buildpack-multi/tests/multi Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.2 to 2.1.3. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.2...2.1.3) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 07c4818d9..9220a718f 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==2.3.2 Jinja2==3.1.2 gunicorn==20.1.0 -markupsafe==2.1.2 +markupsafe==2.1.3 From 872a426fb8fca7f3d29642f9a53ecad35cf5dcac Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 7 Jun 2023 20:30:38 -0400 Subject: [PATCH 238/871] Update python to version v233 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 24d0ba759..22c4cb21d 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v232 +v233 From c74ddbe9904666d9ed9bb4eee6f240475ddd80f8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 8 Jun 2023 19:53:47 -0400 Subject: [PATCH 239/871] feat: automate updates of buildpacks in ci --- .github/workflows/update.yml | 19 +++++++++++++++++++ Makefile | 18 +++++++++++++----- 2 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/update.yml diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml new file mode 100644 index 000000000..be51da416 --- /dev/null +++ b/.github/workflows/update.yml @@ -0,0 +1,19 @@ +--- +name: Bump buildpacks + +# yamllint disable-line rule:truthy +on: + schedule: + - cron: '37 13 * * *' + workflow_dispatch: {} + +jobs: + build: + name: bump-buildpacks + runs-on: ubuntu-20.04 + steps: + - name: bump buildpacks + run: | + make bumpup + env: + GITHUB_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }} diff --git a/Makefile b/Makefile index 5f3ae7039..5bb584945 100644 --- a/Makefile +++ b/Makefile @@ -202,16 +202,24 @@ release-packagecloud-rpm: package_cloud build/rpm/$(NAME)-$(VERSION)-1.x86_64.rp bumpup: for i in $(BUILDPACK_ORDER); do \ url=$$(cat buildpacks/buildpack-$$i/buildpack-url) ; \ + current_version=$$(cat buildpacks/buildpack-$$i/buildpack-version) ; \ version=$$(git ls-remote --tags $$url | awk '{print $$2}' | sed 's/refs\/tags\///' | egrep 'v[0-9]+$$' | sed 's/v//' | sort -n | tail -n 1) ; \ + branch_name=$$(echo "update-$$i-from-$$current_version-to-$$version") ; \ if [[ "x$$version" != 'x' ]]; then \ + if [[ $$(git rev-parse --verify $$branch_name 2>/dev/null) ]] ; then \ + continue ; \ + fi ; \ echo v$$version > buildpacks/buildpack-$$i/buildpack-version ; \ git status -s buildpacks/buildpack-$$i/buildpack-version | fgrep ' M ' ; \ - if [[ $$? -eq 0 ]] ; then \ - git checkout -b $$(date +%Y%m%d)-update-$$i ; \ - git add buildpacks/buildpack-$$i/buildpack-version ; \ - git commit -m "Update $$i to version v$$version" ; \ - git checkout - ; \ + if [[ $$? -eq 1 ]] ; then \ + continue ; \ fi ; \ + git checkout -b $$branch_name ; \ + git add buildpacks/buildpack-$$i/buildpack-version ; \ + git commit -m "Update $$i to version v$$version" ; \ + git checkout - ; \ + git push origin $$branch_name ; \ + gh pr create --title "Update $$i to version v$$version" --head $$branch_name ; \ fi ; \ done From 17f9a491b5013b99d980713af11f8bebc734872a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 8 Jun 2023 19:55:08 -0400 Subject: [PATCH 240/871] fix: ensure the codebase is available for the make target to run --- .github/workflows/update.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index be51da416..d493c5909 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -12,6 +12,10 @@ jobs: name: bump-buildpacks runs-on: ubuntu-20.04 steps: + - uses: actions/checkout@v3 + with: + fetch-depth: 0 + - name: bump buildpacks run: | make bumpup From dbc6b51bac009e66bcde93d43d7f05607211fa2a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Jun 2023 11:08:12 +0000 Subject: [PATCH 241/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.6.0 to 3.6.1. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.6.0...v3.6.1) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 9258b7218..18241a9d8 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2008,16 +2008,16 @@ }, { "name": "twig/twig", - "version": "v3.6.0", + "version": "v3.6.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "106c170d08e8415d78be2d16c3d057d0d108262b" + "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/106c170d08e8415d78be2d16c3d057d0d108262b", - "reference": "106c170d08e8415d78be2d16c3d057d0d108262b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", + "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", "shasum": "" }, "require": { @@ -2063,7 +2063,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.6.0" + "source": "https://github.com/twigphp/Twig/tree/v3.6.1" }, "funding": [ { @@ -2075,7 +2075,7 @@ "type": "tidelift" } ], - "time": "2023-05-03T19:06:57+00:00" + "time": "2023-06-08T12:52:13+00:00" } ], "packages-dev": [ From ee72bb4c2b46aa8e0567bd18dcc67b8ff689022a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jun 2023 15:35:42 -0400 Subject: [PATCH 242/871] fix: ensure git is configured correctly --- .github/workflows/update.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index d493c5909..d33f08db0 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -16,6 +16,11 @@ jobs: with: fetch-depth: 0 + - name: configure git + run: | + git config --global user.name 'Dokku Bot' + git config --global user.email no-reply@dokku.com + - name: bump buildpacks run: | make bumpup From 07a9c9c096be763321d54cd724c9c38f63024342 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 9 Jun 2023 15:37:27 -0400 Subject: [PATCH 243/871] fix: add body so gh pr create does not complain Not sure why all PRs need a body... --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5bb584945..16071831d 100644 --- a/Makefile +++ b/Makefile @@ -219,7 +219,7 @@ bumpup: git commit -m "Update $$i to version v$$version" ; \ git checkout - ; \ git push origin $$branch_name ; \ - gh pr create --title "Update $$i to version v$$version" --head $$branch_name ; \ + gh pr create --title "Update $$i to version v$$version" --body "From $$current_version" --head $$branch_name ; \ fi ; \ done From b0396dc8ee18226b020d1294387e8b63905f9131 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 9 Jun 2023 19:38:35 +0000 Subject: [PATCH 244/871] Update php to version v235 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index a049ff44b..a2f544cdf 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v234 +v235 From 5ed2ffe2fef602b9a2e10705098d778ff75b5b84 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Jun 2023 11:56:37 +0000 Subject: [PATCH 245/871] chore(deps-dev): bump test-unit Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.5.9 to 3.6.0. - [Release notes](https://github.com/test-unit/test-unit/releases) - [Commits](https://github.com/test-unit/test-unit/compare/3.5.9...3.6.0) --- updated-dependencies: - dependency-name: test-unit dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 561032833..6c9627ba7 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -19,7 +19,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.0.6) tilt (~> 2.0) - test-unit (3.5.9) + test-unit (3.6.0) power_assert tilt (2.1.0) From 2c399c07950c5a903df58d06624da20df9930710 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Jun 2023 11:56:33 +0000 Subject: [PATCH 246/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 9d24e2e94..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.1.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 4ff6e98e7281ebaa11e82ec9ffc9259eefec9805 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 15 Jun 2023 11:56:29 +0000 Subject: [PATCH 247/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 9b8fbfb9b6a0b08d062d47d2011d9319cbab4883 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 16 Jun 2023 11:56:34 +0000 Subject: [PATCH 248/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 83027bd75a92c6bf2580d5752729a04ea43e66b6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 19 Jun 2023 11:56:36 +0000 Subject: [PATCH 249/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From e21f07cb22ddbdd2c941669ee165fe71ffa68145 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Jun 2023 11:56:32 +0000 Subject: [PATCH 250/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 20f74eded321c71cc18f59ee7a2567485ed46978 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Jun 2023 11:56:29 +0000 Subject: [PATCH 251/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From f2106b8e206f16c5c029216895747b34a9e43e88 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 21 Jun 2023 21:20:49 +0000 Subject: [PATCH 252/871] Update nodejs to version v215 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 2b391c624..1ffbdb7c1 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v213 +v215 From 1a6d079ab569cae9238fa3f320b48e820d47e5fb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Jun 2023 11:56:30 +0000 Subject: [PATCH 253/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 33dc2d9b4e970e182aa35af34da7426e4bea182d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 23 Jun 2023 11:56:28 +0000 Subject: [PATCH 254/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 7a4915e9dcf53d22f33314c104975753144a3a18 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 11:56:33 +0000 Subject: [PATCH 255/871] chore(deps-dev): bump test-unit Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.6.0 to 3.6.1. - [Release notes](https://github.com/test-unit/test-unit/releases) - [Commits](https://github.com/test-unit/test-unit/compare/3.6.0...3.6.1) --- updated-dependencies: - dependency-name: test-unit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 6c9627ba7..70ea5e25b 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -19,7 +19,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.0.6) tilt (~> 2.0) - test-unit (3.6.0) + test-unit (3.6.1) power_assert tilt (2.1.0) From f91ee67643aa61c5f134755114cb23438bd3ab70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 26 Jun 2023 11:56:45 +0000 Subject: [PATCH 256/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 8616d6d36d2ac06fb3b04ddaf10d51a739372bdb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 27 Jun 2023 13:38:58 +0000 Subject: [PATCH 257/871] Update go to version v175 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index f76f82076..6a07bb423 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v174 +v175 From 27cc693c4ed096e110ebed02deb64f2aab5e2446 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 28 Jun 2023 11:56:31 +0000 Subject: [PATCH 258/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 3daae2ea9ba88196fa6232bc699603b051eb9df6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 29 Jun 2023 11:57:25 +0000 Subject: [PATCH 259/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 064b7fe2bfe9fb28ede0b20d57c26095ec0f7121 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 30 Jun 2023 11:01:24 +0000 Subject: [PATCH 260/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 7c2f9cddad1a25ee0c731d582c7da0a1cf51fdb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:58:29 +0000 Subject: [PATCH 261/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 6416a515168803907ec8e90f8c2087c60a7feb4e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 8 Jul 2023 13:38:17 +0000 Subject: [PATCH 262/871] Update nodejs to version v216 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 1ffbdb7c1..5f967adee 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v215 +v216 From 2489954aa96a938fa9df6eb0e19625b0e76778e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 10 Jul 2023 11:00:50 +0000 Subject: [PATCH 263/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 6477663b505b04714ee9ede13121ffc9421beb9d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 13 Jul 2023 11:54:03 +0000 Subject: [PATCH 264/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 3814adaf9e1c3864ffe1316e517e19f90c2a0582 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jul 2023 11:37:53 +0000 Subject: [PATCH 265/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From c7185f9211b85802229bb076f17c8ced7873f476 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 17 Jul 2023 11:21:55 +0000 Subject: [PATCH 266/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From e74ea0847cd8f82320dfd22d3393bb72206af5f6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:11:06 +0000 Subject: [PATCH 267/871] chore(deps): bump gunicorn in /buildpacks/buildpack-multi/tests/multi Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 21.2.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/20.1.0...21.2.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 9220a718f..466cfb62a 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==2.3.2 Jinja2==3.1.2 -gunicorn==20.1.0 +gunicorn==21.2.0 markupsafe==2.1.3 From fb70598efc93ff1657ee51a16e2d87383f67b2f1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:12:04 +0000 Subject: [PATCH 268/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 21.2.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/20.1.0...21.2.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 9220a718f..466cfb62a 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==2.3.2 Jinja2==3.1.2 -gunicorn==20.1.0 +gunicorn==21.2.0 markupsafe==2.1.3 From 43ff5ed2ad54171fe2ae493239a923403844ee70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:50:03 +0000 Subject: [PATCH 269/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 20.1.0 to 21.2.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/20.1.0...21.2.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index 49344bc07..ce186ac73 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ Django==2.2.28 -gunicorn==20.1.0 +gunicorn==21.2.0 From 607416618da9499a30404c09189c00bbc7be00af Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 20 Jul 2023 13:38:42 +0000 Subject: [PATCH 270/871] Update nodejs to version v217 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 5f967adee..a8645e2be 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v216 +v217 From ff9ea8e6d8df62db889fb66d703e349210281933 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 21 Jul 2023 01:48:06 +0000 Subject: [PATCH 271/871] Update php to version v236 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index a2f544cdf..6fdce0bc6 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v235 +v236 From 76624ca93a6e3164e27deb256b50b034c96c5e0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 21 Jul 2023 11:38:01 +0000 Subject: [PATCH 272/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 3.0.6. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 559915cb9fc53e745fc8a598c7e2428e789725f0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jul 2023 11:18:50 +0000 Subject: [PATCH 273/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 3.0.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 09c729cd509c760cc6bda2472c3429bf9fb56a73 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 24 Jul 2023 13:38:17 +0000 Subject: [PATCH 274/871] Update python to version v234 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 22c4cb21d..a049ff44b 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v233 +v234 From 3e40d5b1ce3e6b69d725e3bc382d664842d239b1 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 25 Jul 2023 13:38:11 +0000 Subject: [PATCH 275/871] Update ruby to version v255 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 24446d231..c6dd33869 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v254 +v255 From 5a3ce4fc251026f0281e33309e4de97c8ad48610 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 25 Jul 2023 13:38:14 +0000 Subject: [PATCH 276/871] Update nodejs to version v218 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a8645e2be..975955610 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v217 +v218 From 09cf748311bb84eef8ec5dcc61f0c1169b15652d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 11:17:00 +0000 Subject: [PATCH 277/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.6.1 to 3.7.0. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.6.1...v3.7.0) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 18241a9d8..155c44dcd 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2008,16 +2008,16 @@ }, { "name": "twig/twig", - "version": "v3.6.1", + "version": "v3.7.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd" + "reference": "5cf942bbab3df42afa918caeba947f1b690af64b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", - "reference": "7e7d5839d4bec168dfeef0ac66d5c5a2edbabffd", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b", + "reference": "5cf942bbab3df42afa918caeba947f1b690af64b", "shasum": "" }, "require": { @@ -2063,7 +2063,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.6.1" + "source": "https://github.com/twigphp/Twig/tree/v3.7.0" }, "funding": [ { @@ -2075,7 +2075,7 @@ "type": "tidelift" } ], - "time": "2023-06-08T12:52:13+00:00" + "time": "2023-07-26T07:16:09+00:00" } ], "packages-dev": [ From 15a2db92b8b564c23c55a58afe05d4600df681d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 26 Jul 2023 11:38:58 +0000 Subject: [PATCH 278/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.0.6 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) Updates `rack` from 3.0.8 to 2.2.7 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.7) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..1174854f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.7) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 8492a612c598a0a03a9b090a24f84653363269c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 Jul 2023 11:22:18 +0000 Subject: [PATCH 279/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.7 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v3.0.8) Updates `sinatra` from 3.0.6 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.6...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 1174854f5..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.7) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 5a62eb50daac3bc97fd9bb3760a1273b50782ad5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:51:34 +0000 Subject: [PATCH 280/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.0.6 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..ef8344947 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From b51a87d41b8218a1d4bd47a806d879c06f720c78 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 31 Jul 2023 11:59:04 +0000 Subject: [PATCH 281/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 2.2.7 to 2.2.8. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.7...v2.2.8) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 70ea5e25b..ff936e459 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -7,7 +7,7 @@ GEM power_assert (2.0.3) puma (6.3.0) nio4r (~> 2.0) - rack (2.2.7) + rack (2.2.8) rack-protection (3.0.6) rack rack-test (2.1.0) From d8adb25b24287f138990c2df3dc6f3a46e16ea0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= <6475387+Coffee2CodeNL@users.noreply.github.com> Date: Mon, 31 Jul 2023 19:10:48 +0200 Subject: [PATCH 282/871] Add Bookworm Support --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 16071831d..ec4349fc5 100644 --- a/Makefile +++ b/Makefile @@ -195,6 +195,7 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_all.deb release-packagecloud-rpm: package_cloud build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm From 89dd88d1878051adeeb64d85c5a2e6fc5b77de0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mon=20S?= <6475387+Coffee2CodeNL@users.noreply.github.com> Date: Mon, 31 Jul 2023 19:19:24 +0200 Subject: [PATCH 283/871] Tabs instead of Spaces --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ec4349fc5..156eff5b9 100644 --- a/Makefile +++ b/Makefile @@ -195,7 +195,7 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb - package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bookworm build/deb/$(NAME)_$(VERSION)_all.deb release-packagecloud-rpm: package_cloud build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm package_cloud push $(PACKAGECLOUD_REPOSITORY)/el/7 build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm From abac7a67a13585f5b74d21bd9bee5d70aac7d1e5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 11:42:15 +0000 Subject: [PATCH 284/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.0.6 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.6...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index ef8344947..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.0.6) - rack - ruby2_keywords (0.0.5) - sinatra (3.0.6) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From bafc03da03e325b46bac37f42a9c8c7b1cf9422f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 2 Aug 2023 11:01:49 +0000 Subject: [PATCH 285/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.0.6 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.0.6) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..ef8344947 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.0.6) + rack + ruby2_keywords (0.0.5) + sinatra (3.0.6) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.0.6) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From cbd52a2cb916c6edd0b121cad56266fb528854f5 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 2 Aug 2023 13:38:19 +0000 Subject: [PATCH 286/871] Update go to version v176 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 6a07bb423..5c7f6c306 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v175 +v176 From ee6de430904bcce9cf7d8c0e0230292310bfa3ec Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 5 Aug 2023 01:12:53 +0000 Subject: [PATCH 287/871] Update ruby to version v256 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index c6dd33869..810baa82b 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v255 +v256 From 30418befffd9ed5de460be2c596f39606e64af8e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 5 Aug 2023 01:12:58 +0000 Subject: [PATCH 288/871] Update php to version v237 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 6fdce0bc6..529193d15 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v236 +v237 From 58607edaf643b1e75fa8b991526e6d23b27b9df7 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 6 Aug 2023 19:09:21 -0400 Subject: [PATCH 289/871] Release 0.6.1 - #933 @dependabot: chore(deps): bump puma from 6.2.2 to 6.3.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #934 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-multi/tests/multi - #935 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-python/tests/python-flask - #936 @josegonzalez: Update python to version v233 - #937 @josegonzalez: feat: automate updates of buildpacks in ci - #938 @josegonzalez: fix: ensure the codebase is available for the make target to run - #939 @dependabot: chore(deps): bump twig/twig from 3.6.0 to 3.6.1 in /buildpacks/buildpack-php/tests/php - #940 @josegonzalez: Fix issues with auto-bumping buildpacks - #941 @dokku-bot: Update php to version v235 - #942 @dependabot: chore(deps-dev): bump test-unit from 3.5.9 to 3.6.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #943 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #944 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #945 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #946 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #947 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #948 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #949 @dokku-bot: Update nodejs to version v215 - #950 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #951 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #952 @dependabot: chore(deps-dev): bump test-unit from 3.6.0 to 3.6.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #953 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #954 @dokku-bot: Update go to version v175 - #955 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #956 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #957 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #958 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #959 @dokku-bot: Update nodejs to version v216 - #960 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #961 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #962 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #963 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #971 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-multi/tests/multi - #972 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-flask - #973 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-django - #974 @dokku-bot: Update nodejs to version v217 - #975 @dokku-bot: Update php to version v236 - #976 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi - #977 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi - #978 @dokku-bot: Update python to version v234 - #979 @dokku-bot: Update ruby to version v255 - #980 @dokku-bot: Update nodejs to version v218 - #981 @dependabot: chore(deps): bump twig/twig from 3.6.1 to 3.7.0 in /buildpacks/buildpack-php/tests/php - #982 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #983 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #984 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #985 @dependabot: chore(deps): bump rack from 2.2.7 to 2.2.8 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #986 @Coffee2CodeNL: Add Bookworm Support - #987 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #988 @dependabot chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #989 @josegonzalez: Update go to version v176 - #990 @josegonzalez: Update ruby to version v256 - #991 @josegonzalez: Update php to version v237 --- CHANGELOG.md | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 635aeb2d0..5ce860a52 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,57 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.6.1](https://github.com/gliderlabs/herokuish/compare/v0.6.0...v0.6.1) - 2023-08-06 + +- #933 @dependabot: chore(deps): bump puma from 6.2.2 to 6.3.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #934 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-multi/tests/multi +- #935 @dependabot: chore(deps): bump markupsafe from 2.1.2 to 2.1.3 in /buildpacks/buildpack-python/tests/python-flask +- #936 @josegonzalez: Update python to version v233 +- #937 @josegonzalez: feat: automate updates of buildpacks in ci +- #938 @josegonzalez: fix: ensure the codebase is available for the make target to run +- #939 @dependabot: chore(deps): bump twig/twig from 3.6.0 to 3.6.1 in /buildpacks/buildpack-php/tests/php +- #940 @josegonzalez: Fix issues with auto-bumping buildpacks +- #941 @dokku-bot: Update php to version v235 +- #942 @dependabot: chore(deps-dev): bump test-unit from 3.5.9 to 3.6.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #943 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #944 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #945 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #946 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #947 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #948 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #949 @dokku-bot: Update nodejs to version v215 +- #950 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #951 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #952 @dependabot: chore(deps-dev): bump test-unit from 3.6.0 to 3.6.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #953 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #954 @dokku-bot: Update go to version v175 +- #955 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #956 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #957 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #958 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #959 @dokku-bot: Update nodejs to version v216 +- #960 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #961 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #962 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #963 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #971 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-multi/tests/multi +- #972 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-flask +- #973 @dependabot: chore(deps): bump gunicorn from 20.1.0 to 21.2.0 in /buildpacks/buildpack-python/tests/python-django +- #974 @dokku-bot: Update nodejs to version v217 +- #975 @dokku-bot: Update php to version v236 +- #976 @dependabot: chore(deps): bump sinatra from 1.0 to 3.0.6 in /buildpacks/buildpack-multi/tests/multi +- #977 @dependabot: chore(deps): bump rack from 2.2.7 to 3.0.8 in /buildpacks/buildpack-multi/tests/multi +- #978 @dokku-bot: Update python to version v234 +- #979 @dokku-bot: Update ruby to version v255 +- #980 @dokku-bot: Update nodejs to version v218 +- #981 @dependabot: chore(deps): bump twig/twig from 3.6.1 to 3.7.0 in /buildpacks/buildpack-php/tests/php +- #982 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #983 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #984 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #985 @dependabot: chore(deps): bump rack from 2.2.7 to 2.2.8 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #986 @Coffee2CodeNL: Add Bookworm Support +- #987 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi + ## [0.6.0](https://github.com/gliderlabs/herokuish/compare/v0.5.42...v0.6.0) - 2023-05-26 - @josegonzalez Drop Ubuntu 18 support #923 From 3254bcd2084c5a3edfd7b1daa7cecab36b2a0555 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 6 Aug 2023 19:42:33 -0400 Subject: [PATCH 290/871] Release 0.6.1 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 156eff5b9..0cf3bffa0 100644 --- 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.6.0 +VERSION ?= 0.6.1 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish From a249a01c3b28642b50d8f4d850cf3c6b9cbff2b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 11:57:48 +0000 Subject: [PATCH 291/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.6 to 3.1.0. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.6...v3.1.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index ef8344947..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,13 +4,13 @@ GEM mustermann (3.0.0) ruby2_keywords (~> 0.0.1) rack (2.2.8) - rack-protection (3.0.6) - rack + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) ruby2_keywords (0.0.5) - sinatra (3.0.6) + sinatra (3.1.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) + rack-protection (= 3.1.0) tilt (~> 2.0) tilt (2.2.0) From c9bd105dbc0d83477d05bfd257a2ef302a137fe0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 7 Aug 2023 14:08:26 +0000 Subject: [PATCH 292/871] chore(deps): bump sinatra Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.0.6 to 3.1.0. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.0.6...v3.1.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index ff936e459..1668a2a81 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,20 +8,20 @@ GEM puma (6.3.0) nio4r (~> 2.0) rack (2.2.8) - rack-protection (3.0.6) - rack + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rake (13.0.6) ruby2_keywords (0.0.5) - sinatra (3.0.6) + sinatra (3.1.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.0.6) + rack-protection (= 3.1.0) tilt (~> 2.0) test-unit (3.6.1) power_assert - tilt (2.1.0) + tilt (2.2.0) PLATFORMS ruby From b039e8856d7acef2a92d4a7f05747994167af69a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 8 Aug 2023 11:47:28 +0000 Subject: [PATCH 293/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From e54802156a30cd3c396d5a0479d2372ac22ebf42 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 8 Aug 2023 13:38:17 +0000 Subject: [PATCH 294/871] Update go to version v177 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 5c7f6c306..9367faf2c 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v176 +v177 From 09fce58db9a1648109a85c3c0e4c213eb1426b33 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 8 Aug 2023 10:20:28 -0400 Subject: [PATCH 295/871] feat: only install the 22 stack via deb package Most folks only actually use one stack at a time, and using the latest stack is probably a better idea than something slightly outdated, security-wise. --- contrib/post-install | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/post-install b/contrib/post-install index 128d9f992..6a3fb6eae 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -19,7 +19,5 @@ fi VERSION=$(cat /var/lib/herokuish/VERSION) -sudo docker pull "gliderlabs/herokuish:v${VERSION}-20" sudo docker pull "gliderlabs/herokuish:v${VERSION}-22" -sudo docker tag "gliderlabs/herokuish:v${VERSION}-20" gliderlabs/herokuish:latest-20 sudo docker tag "gliderlabs/herokuish:v${VERSION}-22" gliderlabs/herokuish:latest-22 From ec0e54f319cc388e189aa54799140b0c1674b6a4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 8 Aug 2023 22:44:03 -0400 Subject: [PATCH 296/871] Release 0.7.0 - #995 @dependabot: chore(deps): bump sinatra from 3.0.6 to 3.1.0 in /buildpacks/buildpack-multi/tests/multi - #996 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #994 @dependabot: chore(deps): bump sinatra from 3.0.6 to 3.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #997 @dokku-bot: Update go to version v177 - #998 @josegonzalez: Only install the 22 stack via deb package --- CHANGELOG.md | 8 ++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ce860a52..7fcb5da56 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,14 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.7.0](https://github.com/gliderlabs/herokuish/compare/v0.6.1...v0.7.0) - 2023-08-08 + +- #995 @dependabot: chore(deps): bump sinatra from 3.0.6 to 3.1.0 in /buildpacks/buildpack-multi/tests/multi +- #996 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #994 @dependabot: chore(deps): bump sinatra from 3.0.6 to 3.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #997 @dokku-bot: Update go to version v177 +- #998 @josegonzalez: Only install the 22 stack via deb package + ## [0.6.1](https://github.com/gliderlabs/herokuish/compare/v0.6.0...v0.6.1) - 2023-08-06 - #933 @dependabot: chore(deps): bump puma from 6.2.2 to 6.3.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra diff --git a/Makefile b/Makefile index 0cf3bffa0..a95ecb3eb 100644 --- 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.6.1 +VERSION ?= 0.6.2 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 58676a67a..de04d494a 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.6.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.0-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.6.0/herokuish_0.6.0_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.0/herokuish_0.7.0_linux_x86_64.tgz \ | tar -xzC /bin ``` From e36f866fed0c88bd7bb40982bd51647c89789746 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 8 Aug 2023 23:41:21 -0400 Subject: [PATCH 297/871] Release 0.7.0 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a95ecb3eb..2dfdf9e56 100644 --- 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.6.2 +VERSION ?= 0.7.0 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish From bb86b0d49906b4583c6332aa5dea964d5b7b8917 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 9 Aug 2023 00:02:10 -0400 Subject: [PATCH 298/871] fix: use updated method for setting output data See https://github.blog/changelog/2022-10-11-github-actions-deprecating-save-state-and-set-output-commands/ for more information --- .github/workflows/release.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 396a23d71..4a4f843a5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,7 +32,8 @@ jobs: - name: Get the version id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} + run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT + - name: set up qemu uses: docker/setup-qemu-action@v2 From b857084829a2c595e85cfeda05c32442f52b9f3e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:20:16 +0000 Subject: [PATCH 299/871] chore(deps): bump golang from 1.20 to 1.21 Bumps golang from 1.20 to 1.21. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 22d5fd49f..f07005127 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=20 -FROM golang:1.20 AS builder +FROM golang:1.21 AS builder RUN mkdir /src ADD . /src/ WORKDIR /src From adc00cdb133b7eb2b50c27cddf10fbed4176549d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 9 Aug 2023 11:47:46 +0000 Subject: [PATCH 300/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From b54a572535a1c53ad4887380dffb838ff5d075c5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 10 Aug 2023 11:08:03 +0000 Subject: [PATCH 301/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 2e622f484f7e55048a61137557149ce81af8d99e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 11 Aug 2023 13:38:25 +0000 Subject: [PATCH 302/871] Update nodejs to version v219 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 975955610..a40616a65 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v218 +v219 From bd7bec26713dc7e7d09ddca658dba5c28a95a717 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:26:42 +0000 Subject: [PATCH 303/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From d20c2a78981e990804f1530acd093d96d32987bd Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 15 Aug 2023 13:38:33 +0000 Subject: [PATCH 304/871] Update java to version v73 --- buildpacks/buildpack-java/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/buildpack-version b/buildpacks/buildpack-java/buildpack-version index 81d2be9e9..aff9a2a5d 100644 --- a/buildpacks/buildpack-java/buildpack-version +++ b/buildpacks/buildpack-java/buildpack-version @@ -1 +1 @@ -v72 +v73 From 0d660ac106e93262784e481be24a4edfd103e724 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 15 Aug 2023 13:38:38 +0000 Subject: [PATCH 305/871] Update go to version v178 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 9367faf2c..ec7a12221 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v177 +v178 From 3567c3242d452f80287dfcefad442d1fcb4b2e62 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Aug 2023 11:15:27 +0000 Subject: [PATCH 306/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 888b1823235384d9429f3b2a6931b36778097a6a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:23:51 +0000 Subject: [PATCH 307/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.3.0 to 6.3.1. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.3.0...v6.3.1) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 1668a2a81..2af03a310 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -5,7 +5,7 @@ GEM ruby2_keywords (~> 0.0.1) nio4r (2.5.9) power_assert (2.0.3) - puma (6.3.0) + puma (6.3.1) nio4r (~> 2.0) rack (2.2.8) rack-protection (3.1.0) From 041758a00e4ece2a88df0cf79dd2bf8d151c327a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 18 Aug 2023 11:29:53 +0000 Subject: [PATCH 308/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From f7c609e1983133e26be33d7ebfb262a72d9f4b02 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Aug 2023 11:00:54 +0000 Subject: [PATCH 309/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From febefcf3108b1de1ebcf29661b34dc11d421aff7 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 21 Aug 2023 13:38:19 +0000 Subject: [PATCH 310/871] Update static to version v24 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 5502a04f7..54c65116f 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v23 +v24 From f034458024bc252c1b7e59fa84ecbc81515ec5c4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:03:06 +0000 Subject: [PATCH 311/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.3.2...2.3.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 466cfb62a..394a99430 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.3.2 +Flask==2.3.3 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From fa3e9101fe4ce2c878d85d01eecec69f20e276c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Aug 2023 11:33:12 +0000 Subject: [PATCH 312/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 2.3.2 to 2.3.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.3.2...2.3.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 466cfb62a..394a99430 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.3.2 +Flask==2.3.3 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From 3494af3c54b7ed86b33072dc81ef8b298b26d5f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 23 Aug 2023 00:54:14 +0000 Subject: [PATCH 313/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 45a9bf484f311af7d6835ca9a7449c08b7c35fdf Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 25 Aug 2023 13:38:30 +0000 Subject: [PATCH 314/871] Update python to version v235 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index a049ff44b..a2f544cdf 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v234 +v235 From d5c4ce0bf1bc2c36669c6e81ca0a0f8cea138bb4 Mon Sep 17 00:00:00 2001 From: Michael Bianco Date: Fri, 25 Aug 2023 07:54:04 -0600 Subject: [PATCH 315/871] docs: note about mac compatibility and some debugging tips fixes #1018 --- README.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/README.md b/README.md index de04d494a..04b6af205 100644 --- a/README.md +++ b/README.md @@ -167,6 +167,14 @@ Mounting your local app source directory to `/tmp/app` and running `/bin/herokui 1 example, 0 failures ``` +If you are on macOS, you'll want to explicitly set the platform: + +```shell +$ docker run --platform linux/amd64 --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test +``` + +However, there is a risk of compatibility issues when running on a different platform than the one you are developing on. If you are getting strange compilation or segfaults, try running the build process on an x86 platform. + #### Troubleshooting If you run into an issue and looking for more insight into what `herokuish` is doing, you can set the `$TRACE` environment variable. @@ -197,6 +205,14 @@ $ docker run --rm -e TRACE=true -v /abs/app/path:/tmp/app gliderlabs/herokuish / + exit 1 ``` +You can also set a custom buildpack: + +```shell +docker run -e BUILDPACK_URL="https://github.com/custom/buildpack.git#with-a-branch" -e STACK=heroku-20 -e TRACE=true --rm -v ./:/tmp/app -it gliderlabs/herokuish /bin/herokuish test +``` + +Note that the underlying buildpacks will not trace their commands with `TRACE=true` is enabled. They need to independently set `set -x` in order to trace execution. + ## Contributing Pull requests are welcome! Herokuish is written in Bash and Go. Please conform to the [Bash styleguide](https://github.com/progrium/bashstyle) used for this project when writing Bash. From 1cd8b913bb0c319e693fc55cc49490befa661447 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 27 Aug 2023 13:45:38 -0400 Subject: [PATCH 316/871] Release 0.7.1 - #1001 @josegonzalez: Use updated method for setting output data in github actions - #1002 @dependabot: chore(deps): bump golang from 1.20 to 1.21 - #1003 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1004 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1005 @dokku-bot: Update nodejs to version v219 - #1006 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1007 @dokku-bot: Update java to version v73 - #1008 @dokku-bot: Update go to version v178 - #1009 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1011 @dependabot: chore(deps): bump puma from 6.3.0 to 6.3.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1012 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1013 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1014 @dokku-bot: Update static to version v24 - #1015 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-multi/tests/multi - #1016 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1017 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-python/tests/python-flask - #1019 @dokku-bot: Update python to version v235 - #1020 @iloveitaly Note about mac compatibility and some debugging tips --- CHANGELOG.md | 21 +++++++++++++++++++++ README.md | 4 ++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fcb5da56..d00bf422c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,27 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.7.1](https://github.com/gliderlabs/herokuish/compare/v0.7.0...v0.7.1) - 2023-08-27 + +- #1001 @josegonzalez: Use updated method for setting output data in github actions +- #1002 @dependabot: chore(deps): bump golang from 1.20 to 1.21 +- #1003 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1004 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1005 @dokku-bot: Update nodejs to version v219 +- #1006 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1007 @dokku-bot: Update java to version v73 +- #1008 @dokku-bot: Update go to version v178 +- #1009 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1011 @dependabot: chore(deps): bump puma from 6.3.0 to 6.3.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1012 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1013 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1014 @dokku-bot: Update static to version v24 +- #1015 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-multi/tests/multi +- #1016 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1017 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-python/tests/python-flask +- #1019 @dokku-bot: Update python to version v235 +- #1020 @iloveitaly Note about mac compatibility and some debugging tips + ## [0.7.0](https://github.com/gliderlabs/herokuish/compare/v0.6.1...v0.7.0) - 2023-08-08 - #995 @dependabot: chore(deps): bump sinatra from 3.0.6 to 3.1.0 in /buildpacks/buildpack-multi/tests/multi diff --git a/README.md b/README.md index 04b6af205..c71201e67 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.7.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.1-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.7.0/herokuish_0.7.0_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.1/herokuish_0.7.1_linux_x86_64.tgz \ | tar -xzC /bin ``` From 330fad457dd9760f1afc45d25c2a77f1e721efd0 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 27 Aug 2023 15:00:01 -0400 Subject: [PATCH 317/871] Release 0.7.1 - #1001 @josegonzalez: Use updated method for setting output data in github actions - #1002 @dependabot: chore(deps): bump golang from 1.20 to 1.21 - #1003 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1004 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1005 @dokku-bot: Update nodejs to version v219 - #1006 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1007 @dokku-bot: Update java to version v73 - #1008 @dokku-bot: Update go to version v178 - #1009 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1011 @dependabot: chore(deps): bump puma from 6.3.0 to 6.3.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1012 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1013 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1014 @dokku-bot: Update static to version v24 - #1015 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-multi/tests/multi - #1016 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1017 @dependabot: chore(deps): bump flask from 2.3.2 to 2.3.3 in /buildpacks/buildpack-python/tests/python-flask - #1019 @dokku-bot: Update python to version v235 - #1020 @iloveitaly Note about mac compatibility and some debugging tips --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 2dfdf9e56..6cc238212 100644 --- 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.7.0 +VERSION ?= 0.7.1 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish From 50589a95c73e55979514b52dc67c6aafee6dc27a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:46:18 +0000 Subject: [PATCH 318/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 7847007a03fede0c0604bc19cda70ca3fb68c243 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 28 Aug 2023 11:58:00 +0000 Subject: [PATCH 319/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.7.0 to 3.7.1. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.7.0...v3.7.1) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 42 +++++++++---------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 155c44dcd..a2cd5cbe4 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1058,16 +1058,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a" + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/5bbc823adecdae860bb64756d639ecfec17b050a", - "reference": "5bbc823adecdae860bb64756d639ecfec17b050a", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", "shasum": "" }, "require": { @@ -1082,7 +1082,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1120,7 +1120,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -1136,7 +1136,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -1311,16 +1311,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534" + "reference": "42292d99c55abe617799667f454222c54c60e229" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/8ad114f6b39e2c98a8b0e3bd907732c207c2b534", - "reference": "8ad114f6b39e2c98a8b0e3bd907732c207c2b534", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", "shasum": "" }, "require": { @@ -1335,7 +1335,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1374,7 +1374,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -1390,7 +1390,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-07-28T09:04:16+00:00" }, { "name": "symfony/polyfill-php72", @@ -2008,16 +2008,16 @@ }, { "name": "twig/twig", - "version": "v3.7.0", + "version": "v3.7.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "5cf942bbab3df42afa918caeba947f1b690af64b" + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/5cf942bbab3df42afa918caeba947f1b690af64b", - "reference": "5cf942bbab3df42afa918caeba947f1b690af64b", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", "shasum": "" }, "require": { @@ -2027,7 +2027,7 @@ }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^4.4.9|^5.0.9|^6.0" + "symfony/phpunit-bridge": "^5.4.9|^6.3" }, "type": "library", "autoload": { @@ -2063,7 +2063,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.7.0" + "source": "https://github.com/twigphp/Twig/tree/v3.7.1" }, "funding": [ { @@ -2075,7 +2075,7 @@ "type": "tidelift" } ], - "time": "2023-07-26T07:16:09+00:00" + "time": "2023-08-28T11:09:02+00:00" } ], "packages-dev": [ From 4f87e930aeed2d7f8d77e20d0b24aaa28bea05c9 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 1 Sep 2023 13:38:29 +0000 Subject: [PATCH 320/871] Update php to version v238 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 529193d15..e3b78e361 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v237 +v238 From e13c81af0dc2a783ae3e2c1f8d78fe75e85f196f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Sep 2023 11:53:10 +0000 Subject: [PATCH 321/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From 67a7eae583e519362a1f279bf8ec9015767336c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 11:43:21 +0000 Subject: [PATCH 322/871] chore(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 4 ++-- .github/workflows/update.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 065c6072c..af7f96172 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,7 +29,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -118,7 +118,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: actions/setup-go@v4 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4a4f843a5..3e76fdc92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 4cba85b8e..8c00b91c4 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -20,7 +20,7 @@ jobs: - 22 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 @@ -61,7 +61,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index d33f08db0..b9ff547ab 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -12,7 +12,7 @@ jobs: name: bump-buildpacks runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 From dfc88ad168d20a767de485f2601f1123165eb75a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 6 Sep 2023 11:14:07 +0000 Subject: [PATCH 323/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From a98c28b0f1168feb9b6c0e3224a048be67a84bfb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Sep 2023 11:10:41 +0000 Subject: [PATCH 324/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..2ad39a65c 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.2.0) PLATFORMS ruby From df78c67c01ce0b01769a5fe06ffc6fe9fd114ba0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 11 Sep 2023 11:45:21 +0000 Subject: [PATCH 325/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2ad39a65c..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.2.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From d3edf1480f47f82fe6b8170a8458e1f5f45bc113 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:50:31 +0000 Subject: [PATCH 326/871] chore(deps): bump docker/login-action from 2 to 3 Bumps [docker/login-action](https://github.com/docker/login-action) from 2 to 3. - [Release notes](https://github.com/docker/login-action/releases) - [Commits](https://github.com/docker/login-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/login-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e76fdc92..b38bc3681 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -25,7 +25,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 8c00b91c4..b3c557126 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -75,7 +75,7 @@ jobs: - name: Login to DockerHub if: github.event_name != 'pull_request' - uses: docker/login-action@v2 + uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} From 43fd2158392d27fe10f4639670010f3221af9af5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:50:32 +0000 Subject: [PATCH 327/871] chore(deps): bump docker/setup-qemu-action from 2 to 3 Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-qemu-action/releases) - [Commits](https://github.com/docker/setup-qemu-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-qemu-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af7f96172..ef951c259 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -58,7 +58,7 @@ jobs: run: make deps fpm package_cloud - name: set up qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: set up docker buildx id: buildx diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e76fdc92..d65a57008 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,7 +35,7 @@ jobs: run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT - name: set up qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: set up docker buildx id: buildx diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 8c00b91c4..c3a7ce244 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -33,7 +33,7 @@ jobs: ruby-version: 2.6 - name: set up qemu - uses: docker/setup-qemu-action@v2 + uses: docker/setup-qemu-action@v3 - name: set up docker buildx uses: docker/setup-buildx-action@v2 From 890549438eed8b07ed06e9cbe6b798d6252ab30e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 12 Sep 2023 11:50:34 +0000 Subject: [PATCH 328/871] chore(deps): bump docker/setup-buildx-action from 2 to 3 Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 2 to 3. - [Release notes](https://github.com/docker/setup-buildx-action/releases) - [Commits](https://github.com/docker/setup-buildx-action/compare/v2...v3) --- updated-dependencies: - dependency-name: docker/setup-buildx-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index af7f96172..545afb658 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -62,7 +62,7 @@ jobs: - name: set up docker buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: inspect builder run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3e76fdc92..289f7f79b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: - name: set up docker buildx id: buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - name: inspect builder run: | diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 8c00b91c4..69f732a7e 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -36,7 +36,7 @@ jobs: uses: docker/setup-qemu-action@v2 - name: set up docker buildx - uses: docker/setup-buildx-action@v2 + uses: docker/setup-buildx-action@v3 - uses: actions/setup-python@v4 with: From 9aaf5078d124b1d0f26e3466e69366582e0b2fde Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 14 Sep 2023 13:38:36 +0000 Subject: [PATCH 329/871] Update nodejs to version v220 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a40616a65..9a9b7aa01 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v219 +v220 From 81eef5b9a06373eb811e58a4d5a84a313a1c4fc7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 18 Sep 2023 11:54:57 +0000 Subject: [PATCH 330/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..8b169cfce 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.3.0) PLATFORMS ruby From a5a99266803052d77b169c1f0e1e5812976c3287 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 19 Sep 2023 13:38:37 +0000 Subject: [PATCH 331/871] Update clojure to version v91 --- buildpacks/buildpack-clojure/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-clojure/buildpack-version b/buildpacks/buildpack-clojure/buildpack-version index 05068acde..118ad6371 100644 --- a/buildpacks/buildpack-clojure/buildpack-version +++ b/buildpacks/buildpack-clojure/buildpack-version @@ -1 +1 @@ -v90 +v91 From 08f148c63be0a2509ae7da229277104bad45d56d Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 19 Sep 2023 13:38:44 +0000 Subject: [PATCH 332/871] Update go to version v180 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index ec7a12221..6c35a985a 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v178 +v180 From 5ccba6abde49a965677090a503755387911b59ad Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 20 Sep 2023 13:38:34 +0000 Subject: [PATCH 333/871] Update nodejs to version v221 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 9a9b7aa01..c00df0e59 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v220 +v221 From 44c6b0eb2f78a1990687855df8b7890a8765d36e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 21 Sep 2023 11:30:55 +0000 Subject: [PATCH 334/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.3.1 to 6.4.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.3.1...v6.4.0) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 2af03a310..762621fb2 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -5,7 +5,7 @@ GEM ruby2_keywords (~> 0.0.1) nio4r (2.5.9) power_assert (2.0.3) - puma (6.3.1) + puma (6.4.0) nio4r (~> 2.0) rack (2.2.8) rack-protection (3.1.0) From 956cc267f860152c835ec2d4f3c5723092a2f136 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 21 Sep 2023 13:38:43 +0000 Subject: [PATCH 335/871] Update ruby to version v257 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 810baa82b..65823ccea 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v256 +v257 From 141e445adb0c5a81383737c2d9973458a96ff05b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Sep 2023 11:13:16 +0000 Subject: [PATCH 336/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8b169cfce..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.3.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From cd57d10532412f4d064553eaddd19e05f9d802f3 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 26 Sep 2023 13:38:35 +0000 Subject: [PATCH 337/871] Update nodejs to version v222 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index c00df0e59..96ed0f2af 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v221 +v222 From 561c6777fe250abd94b169a0df4a278f19a4429d Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 27 Sep 2023 13:38:29 +0000 Subject: [PATCH 338/871] Update ruby to version v258 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 65823ccea..1fb858c0d 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v257 +v258 From 368778dcde2be197da2686bc750449596618a19b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 29 Sep 2023 11:36:35 +0000 Subject: [PATCH 339/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..8b169cfce 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.3.0) PLATFORMS ruby From 30ca455a1bd7a3e993ffafeb9a1b617e8cb285ed Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 1 Oct 2023 06:24:43 +0000 Subject: [PATCH 340/871] Update php to version v239 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index e3b78e361..29b3cfb96 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v238 +v239 From 0786214ada6010369f2e08d935ef8f2994641cbb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:30:21 +0000 Subject: [PATCH 341/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 2.3.3 to 3.0.0. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.3.3...3.0.0) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 394a99430..1b627279b 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.3.3 +Flask==3.0.0 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From 1f13690d0adfff9be67e4f2f46605b69fc6b8ecd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:32:06 +0000 Subject: [PATCH 342/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 2.3.3 to 3.0.0. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/2.3.3...3.0.0) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 394a99430..1b627279b 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==2.3.3 +Flask==3.0.0 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From 633dac3f15695082f05c4da4fe6ca133e5f323cb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Oct 2023 11:50:19 +0000 Subject: [PATCH 343/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8b169cfce..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.3.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 69db924e2b2fa1f5733a5cdea33915d88c1d53b6 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 2 Oct 2023 20:28:48 +0000 Subject: [PATCH 344/871] Update ruby to version v259 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 1fb858c0d..af424770b 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v258 +v259 From fe38a77f28a93dd19228b20f5e40f376b11fa51a Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 2 Oct 2023 20:28:53 +0000 Subject: [PATCH 345/871] Update python to version v236 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index a2f544cdf..6fdce0bc6 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v235 +v236 From cc60a26b44ccea51705e8b66d4945b99f23073b3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 3 Oct 2023 11:03:02 +0000 Subject: [PATCH 346/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..8b169cfce 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.3.0) PLATFORMS ruby From 166f1994570af5816ef3b6ab5aa5d386a7270a27 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 4 Oct 2023 13:38:33 +0000 Subject: [PATCH 347/871] Update python to version v237 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 6fdce0bc6..529193d15 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v236 +v237 From 3ef358eaf62376071c74a2c0eab8f765f2ad9ae0 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 5 Oct 2023 13:38:43 +0000 Subject: [PATCH 348/871] Update nodejs to version v223 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 96ed0f2af..9723eb6a0 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v222 +v223 From 4b8920dc0ce5a2b7225bc535bd7db510dcf1f555 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Oct 2023 11:07:15 +0000 Subject: [PATCH 349/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8b169cfce..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.3.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From afef0c799433e248f5cd615767ec3e443a78287b Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 11 Oct 2023 20:39:47 +0000 Subject: [PATCH 350/871] Update nodejs to version v224 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 9723eb6a0..cc08b9dfa 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v223 +v224 From cf4e975f69f9276d4acb19e331b5fee5ed73052b Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 11 Oct 2023 20:39:54 +0000 Subject: [PATCH 351/871] Update go to version v181 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 6c35a985a..7188d926f 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v180 +v181 From 786c0ec13a6b48cde3c15d76fe23c22929f29b4c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 11 Oct 2023 15:47:51 -0700 Subject: [PATCH 352/871] Release 0.7.2 - #1024 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1025 @dependabot: chore(deps): bump twig/twig from 3.7.0 to 3.7.1 in /buildpacks/buildpack-php/tests/php - #1026 @dokku-bot: Update php to version v238 - #1027 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1028 @dependabot: chore(deps): bump actions/checkout from 3 to 4 - #1029 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1030 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1031 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1032 @dependabot: chore(deps): bump docker/login-action from 2 to 3 - #1033 @dependabot: chore(deps): bump docker/setup-qemu-action from 2 to 3 - #1034 @dependabot: chore(deps): bump docker/setup-buildx-action from 2 to 3 - #1035 @dokku-bot: Update nodejs to version v220 - #1036 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1037 @dokku-bot: Update clojure to version v91 - #1038 @dokku-bot: Update go to version v180 - #1039 @dokku-bot: Update nodejs to version v221 - #1040 @dependabot: chore(deps): bump puma from 6.3.1 to 6.4.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1041 @dokku-bot: Update ruby to version v257 - #1042 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1043 @dokku-bot: Update nodejs to version v222 - #1044 @dokku-bot: Update ruby to version v258 - #1045 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1046 @dokku-bot: Update php to version v239 - #1047 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-python/tests/python-flask - #1048 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-multi/tests/multi - #1049 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1050 @dokku-bot: Update ruby to version v259 - #1051 @dokku-bot: Update python to version v236 - #1053 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1054 @dokku-bot: Update python to version v237 - #1055 @dokku-bot: Update nodejs to version v223 - #1056 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1057 @dokku-bot: Update nodejs to version v224 - #1058 @dokku-bot: Update go to version v181 --- CHANGELOG.md | 37 +++++++++++++++++++++++++++++++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 40 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d00bf422c..ed71ecedd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,43 @@ # Change Log All notable changes to this project will be documented in this file. +## [0.7.2](https://github.com/gliderlabs/herokuish/compare/v0.7.1...v0.7.2) - 2023-10-11 + +- #1024 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1025 @dependabot: chore(deps): bump twig/twig from 3.7.0 to 3.7.1 in /buildpacks/buildpack-php/tests/php +- #1026 @dokku-bot: Update php to version v238 +- #1027 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1028 @dependabot: chore(deps): bump actions/checkout from 3 to 4 +- #1029 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1030 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1031 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1032 @dependabot: chore(deps): bump docker/login-action from 2 to 3 +- #1033 @dependabot: chore(deps): bump docker/setup-qemu-action from 2 to 3 +- #1034 @dependabot: chore(deps): bump docker/setup-buildx-action from 2 to 3 +- #1035 @dokku-bot: Update nodejs to version v220 +- #1036 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1037 @dokku-bot: Update clojure to version v91 +- #1038 @dokku-bot: Update go to version v180 +- #1039 @dokku-bot: Update nodejs to version v221 +- #1040 @dependabot: chore(deps): bump puma from 6.3.1 to 6.4.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1041 @dokku-bot: Update ruby to version v257 +- #1042 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1043 @dokku-bot: Update nodejs to version v222 +- #1044 @dokku-bot: Update ruby to version v258 +- #1045 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1046 @dokku-bot: Update php to version v239 +- #1047 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-python/tests/python-flask +- #1048 @dependabot: chore(deps): bump flask from 2.3.3 to 3.0.0 in /buildpacks/buildpack-multi/tests/multi +- #1049 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1050 @dokku-bot: Update ruby to version v259 +- #1051 @dokku-bot: Update python to version v236 +- #1053 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1054 @dokku-bot: Update python to version v237 +- #1055 @dokku-bot: Update nodejs to version v223 +- #1056 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1057 @dokku-bot: Update nodejs to version v224 +- #1058 @dokku-bot: Update go to version v181 + ## [0.7.1](https://github.com/gliderlabs/herokuish/compare/v0.7.0...v0.7.1) - 2023-08-27 - #1001 @josegonzalez: Use updated method for setting output data in github actions diff --git a/Makefile b/Makefile index 6cc238212..3d3834509 100644 --- 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.7.1 +VERSION ?= 0.7.2 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index c71201e67..9b18b5ce2 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.7.1-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.2-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.7.1/herokuish_0.7.1_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.2/herokuish_0.7.2_linux_x86_64.tgz \ | tar -xzC /bin ``` From 5326cadaac88c31183a4d9c6be745044e1084779 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 12 Oct 2023 11:13:53 +0000 Subject: [PATCH 353/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 1.0 to 3.1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v3.1.0) Updates `rack` from 3.0.8 to 2.2.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v2.2.8) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..8b169cfce 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,18 @@ GEM remote: http://rubygems.org/ specs: - rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) + rack (2.2.8) + rack-protection (3.1.0) + rack (~> 2.2, >= 2.2.4) + ruby2_keywords (0.0.5) + sinatra (3.1.0) + mustermann (~> 3.0) + rack (~> 2.2, >= 2.2.4) + rack-protection (= 3.1.0) + tilt (~> 2.0) + tilt (2.3.0) PLATFORMS ruby From 6caad3f95772849245e907eec897e295c01cddb3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Oct 2023 11:53:33 +0000 Subject: [PATCH 354/871] chore(deps): bump rack and sinatra Bumps [rack](https://github.com/rack/rack) and [sinatra](https://github.com/sinatra/sinatra). These dependencies needed to be updated together. Updates `rack` from 2.2.8 to 3.0.8 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v3.0.8) Updates `sinatra` from 3.1.0 to 1.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8b169cfce..353dbf685 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,18 +1,9 @@ GEM remote: http://rubygems.org/ specs: - mustermann (3.0.0) - ruby2_keywords (~> 0.0.1) - rack (2.2.8) - rack-protection (3.1.0) - rack (~> 2.2, >= 2.2.4) - ruby2_keywords (0.0.5) - sinatra (3.1.0) - mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) - tilt (~> 2.0) - tilt (2.3.0) + rack (3.0.8) + sinatra (1.0) + rack (>= 1.0) PLATFORMS ruby From 70a8b574c91df956046c6552a10eb0d9a9d4d2eb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 24 Oct 2023 11:36:16 +0000 Subject: [PATCH 355/871] chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.0 to 3.6.1. - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index 51c009ae6..c9ad995bf 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.0 + 3.6.1 copy-dependencies From 80c696a8ccc5f807c615b92b8349df102b32963e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 24 Oct 2023 13:38:31 +0000 Subject: [PATCH 356/871] Update ruby to version v260 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index af424770b..0a7f56edd 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v259 +v260 From 1de92ab9d24b778f7191345b03ace6975cc8a16e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 27 Oct 2023 13:38:37 +0000 Subject: [PATCH 357/871] Update nodejs to version v227 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index cc08b9dfa..edc8339f3 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v224 +v227 From 7f75986c348f5cd1b77e38986f3ecc16ca2a12fa Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 27 Oct 2023 13:38:42 +0000 Subject: [PATCH 358/871] Update php to version v240 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 29b3cfb96..8c9e1ccb4 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v239 +v240 From fb88d364ffc81825302ceeff8f1d11b08306fad6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:29:33 +0000 Subject: [PATCH 359/871] chore(deps): bump monolog/monolog in /buildpacks/buildpack-php/tests/php Bumps [monolog/monolog](https://github.com/Seldaek/monolog) from 2.9.1 to 2.9.2. - [Release notes](https://github.com/Seldaek/monolog/releases) - [Changelog](https://github.com/Seldaek/monolog/blob/main/CHANGELOG.md) - [Commits](https://github.com/Seldaek/monolog/compare/2.9.1...2.9.2) --- updated-dependencies: - dependency-name: monolog/monolog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index a2cd5cbe4..57a0f0c3c 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "monolog/monolog", - "version": "2.9.1", + "version": "2.9.2", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1" + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/f259e2b15fb95494c83f52d3caad003bbf5ffaa1", - "reference": "f259e2b15fb95494c83f52d3caad003bbf5ffaa1", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", "shasum": "" }, "require": { @@ -94,7 +94,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.1" + "source": "https://github.com/Seldaek/monolog/tree/2.9.2" }, "funding": [ { @@ -106,7 +106,7 @@ "type": "tidelift" } ], - "time": "2023-02-06T13:44:46+00:00" + "time": "2023-10-27T15:25:26+00:00" }, { "name": "pimple/pimple", From eac84852bc7415dfc7a0a35035d047ab0b0a120d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Oct 2023 11:33:46 +0000 Subject: [PATCH 360/871] chore(deps): bump rake in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rake](https://github.com/ruby/rake) from 13.0.6 to 13.1.0. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.0.6...v13.1.0) --- updated-dependencies: - dependency-name: rake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 762621fb2..08a4af572 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -12,7 +12,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) - rake (13.0.6) + rake (13.1.0) ruby2_keywords (0.0.5) sinatra (3.1.0) mustermann (~> 3.0) From 8f9e3b82c6bb1443fdebf1a7cf0583daac4461bb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 1 Nov 2023 13:38:26 +0000 Subject: [PATCH 361/871] Update nodejs to version v228 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index edc8339f3..41d668b5a 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v227 +v228 From eb1eb574ad4176af7d504dbdf25a138bc9f576ba Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 8 Nov 2023 13:38:18 +0000 Subject: [PATCH 362/871] Update python to version v239 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 529193d15..29b3cfb96 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v237 +v239 From cd7081f99b91c64f414f846bc23f3b661d89ff3a Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 9 Nov 2023 13:38:20 +0000 Subject: [PATCH 363/871] Update ruby to version v262 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 0a7f56edd..3f0ab0065 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v260 +v262 From 25d00101961d617243e5212412061e34604de680 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 11:48:36 +0000 Subject: [PATCH 364/871] chore(deps): bump actions/setup-python from 4 to 5 Bumps [actions/setup-python](https://github.com/actions/setup-python) from 4 to 5. - [Release notes](https://github.com/actions/setup-python/releases) - [Commits](https://github.com/actions/setup-python/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-python dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8a8de609..7d6c0bdef 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -41,7 +41,7 @@ jobs: with: ruby-version: 2.6 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.7.x' diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 214bef808..3ea4ff2b7 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -38,7 +38,7 @@ jobs: - name: set up docker buildx uses: docker/setup-buildx-action@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.7.x' From 38ecea3fe6614051094b2dfe02797748326d90f5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 11:48:39 +0000 Subject: [PATCH 365/871] chore(deps): bump actions/setup-go from 4 to 5 Bumps [actions/setup-go](https://github.com/actions/setup-go) from 4 to 5. - [Release notes](https://github.com/actions/setup-go/releases) - [Commits](https://github.com/actions/setup-go/compare/v4...v5) --- updated-dependencies: - dependency-name: actions/setup-go dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 4 ++-- .github/workflows/tag-release.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8a8de609..3ecaf85c0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -33,7 +33,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.17.8 @@ -120,7 +120,7 @@ jobs: steps: - uses: actions/checkout@v4 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.17.8 diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 214bef808..372becde1 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -24,7 +24,7 @@ jobs: with: fetch-depth: 0 - - uses: actions/setup-go@v4 + - uses: actions/setup-go@v5 with: go-version: 1.17.8 From 0f45380bec873ce8d6efab99e9fd355fad8f3a24 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 9 Dec 2023 23:08:56 -0500 Subject: [PATCH 366/871] feat: update ruby so package_cloud installs properly in ci --- .github/workflows/main.yml | 6 +++--- .github/workflows/tag-release.yml | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d8a8de609..ff5319acc 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,7 +5,7 @@ name: CI on: pull_request: branches: - - '*' + - "*" push: branches: - master @@ -39,11 +39,11 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - uses: actions/setup-python@v4 with: - python-version: '3.7.x' + python-version: "3.7.x" - name: setup env run: make ci-report diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 214bef808..6550cf628 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -5,7 +5,7 @@ name: tag release on: push: branches: - - 'release' + - "release" jobs: build: @@ -30,7 +30,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - name: set up qemu uses: docker/setup-qemu-action@v3 @@ -40,7 +40,7 @@ jobs: - uses: actions/setup-python@v4 with: - python-version: '3.7.x' + python-version: "3.7.x" - name: install requirements run: make deps fpm package_cloud @@ -65,7 +65,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.6 + ruby-version: 2.7 - name: download packages uses: actions/download-artifact@v3 From 412dd6a0cc43b9975f1aa8637ced1319324b97e0 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 10 Dec 2023 04:44:41 +0000 Subject: [PATCH 367/871] Update nodejs to version v232 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 41d668b5a..24d0ba759 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v228 +v232 From fc87125239fe54dcfc97408fa1ab71084e8a3c63 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 10 Dec 2023 04:44:45 +0000 Subject: [PATCH 368/871] Update python to version v241 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 29b3cfb96..b65bf3e4f 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v239 +v241 From bdd65239a58f20895426e8f9f5da3fd9b4975773 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 10 Dec 2023 04:44:48 +0000 Subject: [PATCH 369/871] Update php to version v242 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 8c9e1ccb4..8ba02379b 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v240 +v242 From 093c4986c362eb5c2664740b1cd96cb18c7e039a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 10 Dec 2023 04:44:50 +0000 Subject: [PATCH 370/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.7.1 to 3.8.0. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 57a0f0c3c..901fe3ea9 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1549,16 +1549,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.27.0", + "version": "v1.28.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936" + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", - "reference": "7a6ff3f1959bb01aefccb463a0f2cd3d3d2fd936", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", "shasum": "" }, "require": { @@ -1567,7 +1567,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.27-dev" + "dev-main": "1.28-dev" }, "thanks": { "name": "symfony/polyfill", @@ -1612,7 +1612,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.27.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -1628,7 +1628,7 @@ "type": "tidelift" } ], - "time": "2022-11-03T14:55:06+00:00" + "time": "2023-01-26T09:26:14+00:00" }, { "name": "symfony/routing", @@ -2008,26 +2008,27 @@ }, { "name": "twig/twig", - "version": "v3.7.1", + "version": "v3.8.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", - "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", "shasum": "" }, "require": { "php": ">=7.2.5", "symfony/polyfill-ctype": "^1.8", - "symfony/polyfill-mbstring": "^1.3" + "symfony/polyfill-mbstring": "^1.3", + "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3" + "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" }, "type": "library", "autoload": { @@ -2063,7 +2064,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.7.1" + "source": "https://github.com/twigphp/Twig/tree/v3.8.0" }, "funding": [ { @@ -2075,7 +2076,7 @@ "type": "tidelift" } ], - "time": "2023-08-28T11:09:02+00:00" + "time": "2023-11-21T18:54:41+00:00" } ], "packages-dev": [ @@ -2132,5 +2133,5 @@ "prefer-lowest": false, "platform": [], "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } From 2333ead1edda4d2daa38ebb2db8cfb205312993f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 10 Dec 2023 04:44:51 +0000 Subject: [PATCH 371/871] Update go to version v182 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 7188d926f..c2c965bb2 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v181 +v182 From 4e18de04425401dd56e0e24bcc85d4372582f39f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 22 Dec 2023 13:38:26 +0000 Subject: [PATCH 372/871] Update php to version v243 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 8ba02379b..6b1dadddb 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v242 +v243 From 68ab2d1112720c6efadd26ebd4ffd8ce60686058 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 25 Dec 2023 11:15:09 +0000 Subject: [PATCH 373/871] chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.11.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.11.0...maven-compiler-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index c9ad995bf..c80e19871 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -34,7 +34,7 @@ maven-compiler-plugin - 3.11.0 + 3.12.1 1.6 1.6 From c286eced38f8ff9c8e6c914368b7c02cb1270d5e Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 26 Dec 2023 13:38:21 +0000 Subject: [PATCH 374/871] Update ruby to version v264 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 3f0ab0065..28aa52f89 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v262 +v264 From 76572c42938bf8c41e42b8d0534a7cb4acaf567b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 1 Jan 2024 11:04:39 +0000 Subject: [PATCH 375/871] chore(deps): bump sinatra Bumps [sinatra](https://github.com/sinatra/sinatra) from 3.1.0 to 3.2.0. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.1.0...v3.2.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 08a4af572..c8bc7d1fc 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -1,6 +1,7 @@ GEM remote: http://rubygems.org/ specs: + base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) nio4r (2.5.9) @@ -8,20 +9,21 @@ GEM puma (6.4.0) nio4r (~> 2.0) rack (2.2.8) - rack-protection (3.1.0) + rack-protection (3.2.0) + base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) rake (13.1.0) ruby2_keywords (0.0.5) - sinatra (3.1.0) + sinatra (3.2.0) mustermann (~> 3.0) rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.1.0) + rack-protection (= 3.2.0) tilt (~> 2.0) test-unit (3.6.1) power_assert - tilt (2.2.0) + tilt (2.3.0) PLATFORMS ruby From 4fa37274e64a48a3c0cadc03ba1a514ca7b4e2b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 8 Jan 2024 11:03:11 +0000 Subject: [PATCH 376/871] chore(deps): bump puma in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [puma](https://github.com/puma/puma) from 6.4.0 to 6.4.2. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/master/History.md) - [Commits](https://github.com/puma/puma/compare/v6.4.0...v6.4.2) --- updated-dependencies: - dependency-name: puma dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 08a4af572..8f864ed0e 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -3,9 +3,9 @@ GEM specs: mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - nio4r (2.5.9) + nio4r (2.7.0) power_assert (2.0.3) - puma (6.4.0) + puma (6.4.2) nio4r (~> 2.0) rack (2.2.8) rack-protection (3.1.0) From 42e1e57ae398c401b8eb9f4f66feb337174c0062 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 11 Jan 2024 13:38:34 +0000 Subject: [PATCH 377/871] Update python to version v242 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index b65bf3e4f..8ba02379b 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v241 +v242 From 66afaf2fa4b4c5cc7102f4dc472067e4cf9432c5 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 17 Jan 2024 13:38:32 +0000 Subject: [PATCH 378/871] Update nodejs to version v234 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 24d0ba759..a049ff44b 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v232 +v234 From 44bc366c3d1261d76037974f9142989a3eea39e9 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 17 Jan 2024 13:38:37 +0000 Subject: [PATCH 379/871] Update go to version v184 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index c2c965bb2..3ecae9401 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v182 +v184 From c077874db1f4d817c14601a416ebcfe342734b25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:11:40 +0000 Subject: [PATCH 380/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 1b627279b..4fdacc652 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.0 +Flask==3.0.1 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From 03f516ce170a06f0bed167258c72c6b41aafc921 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Jan 2024 11:41:48 +0000 Subject: [PATCH 381/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 3.0.0 to 3.0.1. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.0...3.0.1) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 1b627279b..4fdacc652 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.0 +Flask==3.0.1 Jinja2==3.1.2 gunicorn==21.2.0 markupsafe==2.1.3 From 595ff9791b7bcfbe2a7a1d9fc8272ea4a740adeb Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 01:13:43 +0000 Subject: [PATCH 382/871] chore(deps): bump jinja2 Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.2...3.1.3) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 4fdacc652..ebcfbd4b1 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 -Jinja2==3.1.2 +Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.3 From fc999178ee4a2a56c14d8809db31fdc58f46f09e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 20 Jan 2024 01:13:57 +0000 Subject: [PATCH 383/871] chore(deps): bump jinja2 in /buildpacks/buildpack-multi/tests/multi Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.2 to 3.1.3. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.2...3.1.3) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 4fdacc652..ebcfbd4b1 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 -Jinja2==3.1.2 +Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.3 From 10b11ed92360c3162d78551f73320c55730bf06a Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 20 Jan 2024 13:38:22 +0000 Subject: [PATCH 384/871] Update static to version v25 --- buildpacks/buildpack-static/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-static/buildpack-version b/buildpacks/buildpack-static/buildpack-version index 54c65116f..a682cfb97 100644 --- a/buildpacks/buildpack-static/buildpack-version +++ b/buildpacks/buildpack-static/buildpack-version @@ -1 +1 @@ -v24 +v25 From 5e2ef3eeb89aab727b304365005e9e680a4dc691 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:31:07 +0000 Subject: [PATCH 385/871] chore(deps): bump sinatra in /buildpacks/buildpack-multi/tests/multi Bumps [sinatra](https://github.com/sinatra/sinatra) from 1.0 to 4.0.0. - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/1.0...v4.0.0) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-multi/tests/multi/Gemfile.lock | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 353dbf685..7b6f5f7b7 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -1,9 +1,23 @@ GEM remote: http://rubygems.org/ specs: + base64 (0.2.0) + mustermann (3.0.0) + ruby2_keywords (~> 0.0.1) rack (3.0.8) - sinatra (1.0) - rack (>= 1.0) + rack-protection (4.0.0) + base64 (>= 0.1.0) + rack (>= 3.0.0, < 4) + rack-session (2.0.0) + rack (>= 3.0.0) + ruby2_keywords (0.0.5) + sinatra (4.0.0) + mustermann (~> 3.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) + tilt (~> 2.0) + tilt (2.3.0) PLATFORMS ruby From 72e33a46420baabaae850f789575ccfea8518d8f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:45:50 +0000 Subject: [PATCH 386/871] chore(deps): bump markupsafe Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.3...2.1.4) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index ebcfbd4b1..d221a5ce9 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.3 +markupsafe==2.1.4 From 296cbaf3320920b6235ee4168f126e2cfa2b9372 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:55:28 +0000 Subject: [PATCH 387/871] chore(deps): bump markupsafe in /buildpacks/buildpack-multi/tests/multi Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.3 to 2.1.4. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.3...2.1.4) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index ebcfbd4b1..d221a5ce9 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.3 +markupsafe==2.1.4 From 093738794df420d12b26f6aec8e2ff1ab81d2f55 Mon Sep 17 00:00:00 2001 From: Tac Tacelosky Date: Mon, 22 Jan 2024 14:43:49 -0600 Subject: [PATCH 388/871] remove $ so gitclip works --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9b18b5ce2..17be01cb8 100644 --- a/README.md +++ b/README.md @@ -131,7 +131,7 @@ issue or an issue with Dokku. Buildpack issues should be filed against Herokuish #### Running an app against Herokuish ```shell -$ docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish test +docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish test ``` Mounting your local app source directory to `/tmp/app` and running `/bin/herokuish test` will run your app through the buildpack compile process. Then it starts your `web` process and attempts to connect to the web root path. If it runs into a problem, it should exit non-zero. @@ -150,7 +150,7 @@ You can use this output when you submit issues. #### Running an app tests using Heroku buildpacks ```shell -$ docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test +docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test ``` Mounting your local app source directory to `/tmp/app` and running `/bin/herokuish buildpack test` will run your app through the buildpack test-compile process. Then it will run `test` command to execute application tests. @@ -170,7 +170,7 @@ Mounting your local app source directory to `/tmp/app` and running `/bin/herokui If you are on macOS, you'll want to explicitly set the platform: ```shell -$ docker run --platform linux/amd64 --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test +docker run --platform linux/amd64 --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test ``` However, there is a risk of compatibility issues when running on a different platform than the one you are developing on. If you are getting strange compilation or segfaults, try running the build process on an x86 platform. From 156fb3527ca5824ef4807439f8ba85c995ad2563 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 23 Jan 2024 13:38:29 +0000 Subject: [PATCH 389/871] Update ruby to version v265 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 28aa52f89..f0d48c716 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v264 +v265 From fcfebc32e1e5f862c525b16736593708c1299f39 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 24 Jan 2024 13:38:31 +0000 Subject: [PATCH 390/871] Update php to version v244 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 6b1dadddb..1e48f7666 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v243 +v244 From 4be09fcdd07c312e0fc148ae772aab9238a6d2db Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 25 Jan 2024 13:38:24 +0000 Subject: [PATCH 391/871] Update nodejs to version v235 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a049ff44b..a2f544cdf 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v234 +v235 From 979aefe3774789ee119b059b4098eb44149e877d Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 29 Jan 2024 07:45:22 -0500 Subject: [PATCH 392/871] Release 0.7.3 - #1060 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi - #1061 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi - #1064 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.0 to 3.6.1 in /buildpacks/buildpack-java/tests/java-jetty - #1065 @dokku-bot: Update ruby to version v260 - #1066 @dokku-bot: Update nodejs to version v227 - #1067 @dokku-bot: Update php to version v240 - #1068 @dependabot: chore(deps): bump monolog/monolog from 2.9.1 to 2.9.2 in /buildpacks/buildpack-php/tests/php - #1069 @dependabot: chore(deps): bump rake from 13.0.6 to 13.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1070 @dokku-bot: Update nodejs to version v228 - #1073 @dokku-bot: Update python to version v239 - #1074 @dokku-bot: Update ruby to version v262 - #1076 @dependabot: chore(deps): bump twig/twig from 3.7.1 to 3.8.0 in /buildpacks/buildpack-php/tests/php - #1082 @dependabot: chore(deps): bump actions/setup-python from 4 to 5 - #1083 @dependabot: chore(deps): bump actions/setup-go from 4 to 5 - #1087 @josegonzalez: Update ruby so package_cloud installs properly in ci - #1088 @dokku-bot: Update nodejs to version v232 - #1089 @dokku-bot: Update python to version v241 - #1090 @dokku-bot: Update php to version v242 - #1091 @dokku-bot: Update go to version v182 - #1096 @dokku-bot: Update php to version v243 - #1097 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.1 in /buildpacks/buildpack-java/tests/java-jetty - #1098 @dokku-bot: Update ruby to version v264 - #1099 @dependabot: chore(deps): bump sinatra from 3.1.0 to 3.2.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1103 @dependabot: chore(deps): bump puma from 6.4.0 to 6.4.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1104 @dependabot: chore(deps): bump jinja2 from 3.1.2 to 3.1.3 in /buildpacks/buildpack-multi/tests/multi - #1105 @dependabot: chore(deps): bump jinja2 from 3.1.2 to 3.1.3 in /buildpacks/buildpack-python/tests/python-flask - #1106 @dokku-bot: Update python to version v242 - #1107 @dokku-bot: Update nodejs to version v234 - #1108 @dokku-bot: Update go to version v184 - #1109 @dependabot: chore(deps): bump flask from 3.0.0 to 3.0.1 in /buildpacks/buildpack-python/tests/python-flask - #1110 @dependabot: chore(deps): bump flask from 3.0.0 to 3.0.1 in /buildpacks/buildpack-multi/tests/multi - #1111 @dokku-bot: Update static to version v25 - #1112 @dependabot: chore(deps): bump sinatra from 1.0 to 4.0.0 in /buildpacks/buildpack-multi/tests/multi - #1113 @dependabot: chore(deps): bump markupsafe from 2.1.3 to 2.1.4 in /buildpacks/buildpack-python/tests/python-flask - #1114 @dependabot: chore(deps): bump markupsafe from 2.1.3 to 2.1.4 in /buildpacks/buildpack-multi/tests/multi - #1115 @tacman: remove $ so gitclip works - #1116 @dokku-bot: Update ruby to version v265 - #1117 @dokku-bot: Update php to version v244 - #1118 @dokku-bot: Update nodejs to version v235 --- CHANGELOG.md | 173 +++++++++++++++++++++++++++++++++++++++++++++++++-- Makefile | 2 +- README.md | 6 +- 3 files changed, 173 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ed71ecedd..02b0e5b96 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,49 @@ # Change Log + All notable changes to this project will be documented in this file. +## [0.7.3](https://github.com/gliderlabs/herokuish/compare/v0.7.2...v0.7.3) - 2024-01-29 + +- #1060 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi +- #1061 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi +- #1064 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.0 to 3.6.1 in /buildpacks/buildpack-java/tests/java-jetty +- #1065 @dokku-bot: Update ruby to version v260 +- #1066 @dokku-bot: Update nodejs to version v227 +- #1067 @dokku-bot: Update php to version v240 +- #1068 @dependabot: chore(deps): bump monolog/monolog from 2.9.1 to 2.9.2 in /buildpacks/buildpack-php/tests/php +- #1069 @dependabot: chore(deps): bump rake from 13.0.6 to 13.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1070 @dokku-bot: Update nodejs to version v228 +- #1073 @dokku-bot: Update python to version v239 +- #1074 @dokku-bot: Update ruby to version v262 +- #1076 @dependabot: chore(deps): bump twig/twig from 3.7.1 to 3.8.0 in /buildpacks/buildpack-php/tests/php +- #1082 @dependabot: chore(deps): bump actions/setup-python from 4 to 5 +- #1083 @dependabot: chore(deps): bump actions/setup-go from 4 to 5 +- #1087 @josegonzalez: Update ruby so package_cloud installs properly in ci +- #1088 @dokku-bot: Update nodejs to version v232 +- #1089 @dokku-bot: Update python to version v241 +- #1090 @dokku-bot: Update php to version v242 +- #1091 @dokku-bot: Update go to version v182 +- #1096 @dokku-bot: Update php to version v243 +- #1097 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.11.0 to 3.12.1 in /buildpacks/buildpack-java/tests/java-jetty +- #1098 @dokku-bot: Update ruby to version v264 +- #1099 @dependabot: chore(deps): bump sinatra from 3.1.0 to 3.2.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1103 @dependabot: chore(deps): bump puma from 6.4.0 to 6.4.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1104 @dependabot: chore(deps): bump jinja2 from 3.1.2 to 3.1.3 in /buildpacks/buildpack-multi/tests/multi +- #1105 @dependabot: chore(deps): bump jinja2 from 3.1.2 to 3.1.3 in /buildpacks/buildpack-python/tests/python-flask +- #1106 @dokku-bot: Update python to version v242 +- #1107 @dokku-bot: Update nodejs to version v234 +- #1108 @dokku-bot: Update go to version v184 +- #1109 @dependabot: chore(deps): bump flask from 3.0.0 to 3.0.1 in /buildpacks/buildpack-python/tests/python-flask +- #1110 @dependabot: chore(deps): bump flask from 3.0.0 to 3.0.1 in /buildpacks/buildpack-multi/tests/multi +- #1111 @dokku-bot: Update static to version v25 +- #1112 @dependabot: chore(deps): bump sinatra from 1.0 to 4.0.0 in /buildpacks/buildpack-multi/tests/multi +- #1113 @dependabot: chore(deps): bump markupsafe from 2.1.3 to 2.1.4 in /buildpacks/buildpack-python/tests/python-flask +- #1114 @dependabot: chore(deps): bump markupsafe from 2.1.3 to 2.1.4 in /buildpacks/buildpack-multi/tests/multi +- #1115 @tacman: remove $ so gitclip works +- #1116 @dokku-bot: Update ruby to version v265 +- #1117 @dokku-bot: Update php to version v244 +- #1118 @dokku-bot: Update nodejs to version v235 + ## [0.7.2](https://github.com/gliderlabs/herokuish/compare/v0.7.1...v0.7.2) - 2023-10-11 - #1024 @dependabot: chore(deps): bump rack and sinatra in /buildpacks/buildpack-multi/tests/multi @@ -376,6 +419,7 @@ All notable changes to this project will be documented in this file. ## [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 @@ -389,6 +433,7 @@ All notable changes to this project will be documented in this file. ## [0.5.26](https://github.com/gliderlabs/herokuish/compare/v0.5.25...v0.5.26) - 2021-02-25 ### Changed + - @josegonzalez Update clojure to version v87 #657 - @josegonzalez Update go to version v152 #656 - @josegonzalez Update gradle to version v35 #655 @@ -403,32 +448,38 @@ All notable changes to this project will be documented in this file. ## [0.5.25](https://github.com/gliderlabs/herokuish/compare/v0.5.24...v0.5.25) - 2021-02-08 ### Changed + - @josegonzalez Update ruby to version v223 #646 - @josegonzalez Update nodejs to version v183 #647 - @josegonzalez Update php to version v189 #648 - @josegonzalez Update go to version v151 #649 ### Added + - @josegonzalez feat: add null buildpack #645 ## [0.5.24](https://github.com/gliderlabs/herokuish/compare/v0.5.23...v0.5.24) - 2021-01-17 ### Changed + - @josegonzalez Update java to version v69 #642 - @josegonzalez Update php to version v188 #640 ## [0.5.23](https://github.com/gliderlabs/herokuish/compare/v0.5.22...v0.5.23) - 2021-01-07 ### Changed + - @josegonzalez Update gradle to version v34 #635 - @josegonzalez Update nodejs to version v182 #635 ### Added + - @josegonzalez publish all stacks to docker hub #637 ## [0.5.22](https://github.com/gliderlabs/herokuish/compare/v0.5.21...v0.5.22) - 2020-12-31 ### Changed + - @josegonzalez Update go to version v149 #627 - @josegonzalez Update php to version v187 #629 - @josegonzalez Update nodejs to version v180 #628 @@ -436,19 +487,23 @@ All notable changes to this project will be documented in this file. - @josegonzalez Update nodejs to version v181 #631 ### Added + - @josegonzalez add ability to build heroku-20 based images #630 ## [0.5.21](https://github.com/gliderlabs/herokuish/compare/v0.5.20...v0.5.21) - 2020-11-22 ### Changed + - @josegonzalez Update gradle to version v33 #624 ### Fixed + - @josegonzalez Change directories after `$HOME` is setup #623 ## [0.5.20](https://github.com/gliderlabs/herokuish/compare/v0.5.19...v0.5.20) - 2020-11-22 ### Changed + - @josegonzalez Update java to version v68 #618 - @josegonzalez Update nodejs to version v178 #619 - @josegonzalez Update php to version v185 #620 @@ -457,6 +512,7 @@ All notable changes to this project will be documented in this file. ## [0.5.19](https://github.com/gliderlabs/herokuish/compare/v0.5.18...v0.5.19) - 2020-11-08 ### Changed + - @josegonzalez Update clojure to version v86 #608 - @josegonzalez Update go to version v148 #609 - @josegonzalez Update gradle to version v32 #610 @@ -469,23 +525,28 @@ All notable changes to this project will be documented in this file. ## [0.5.18](https://github.com/gliderlabs/herokuish/compare/v0.5.17...v0.5.18) - 2020-08-29 ### Fixed + - @josegonzalez Release to the correct packagecloud repository ## [0.5.17](https://github.com/gliderlabs/herokuish/compare/v0.5.16...v0.5.17) - 2020-08-29 ### Fixed + - @josegonzalez add package_cloud to CI environment ## [0.5.16](https://github.com/gliderlabs/herokuish/compare/v0.5.15...v0.5.16) - 2020-08-29 ### Fixed + - @josegonzalez upgrade play test app to fix CI - @josegonzalez prune old gliderlabs/herokuish images ### Added + - @josegonzalez Automate package release ### Changed + - @josegonzalez Update go to version v145 #595 - @josegonzalez Update nodejs to version v175 #592 - @josegonzalez Update php to version v179 #594 @@ -494,6 +555,7 @@ All notable changes to this project will be documented in this file. ## [0.5.15](https://github.com/gliderlabs/herokuish/compare/v0.5.14...v0.5.15) - 2020-07-24 ### Changed + - @cdmwebs Fix Typo in README - @josegonzalez Update python to version v173 - @josegonzalez Update ruby to version v218 @@ -507,12 +569,14 @@ All notable changes to this project will be documented in this file. ## [0.5.14](https://github.com/gliderlabs/herokuish/compare/v0.5.13...v0.5.14) - 2020-06-01 ### Changed + - @josegonzalez Update php to version v176 - @josegonzalez Update python to version v170 ## [0.5.13](https://github.com/gliderlabs/herokuish/compare/v0.5.12...v0.5.13) - 2020-05-07 ### Changed + - @josegonzalez Update go to version v142 - @josegonzalez Update nodejs to version v171 - @josegonzalez Update php to version v174 @@ -520,6 +584,7 @@ All notable changes to this project will be documented in this file. ## [0.5.12](https://github.com/gliderlabs/herokuish/compare/v0.5.11...v0.5.12) - 2020-04-25 ### Changed + - @josegonzalez Update go to version v141 - @josegonzalez Update python to version v169 - @josegonzalez Update ruby to version v215 @@ -528,16 +593,19 @@ All notable changes to this project will be documented in this file. ## [0.5.11](https://github.com/gliderlabs/herokuish/compare/v0.5.10...v0.5.11) - 2020-04-02 ### Changed + - @josegonzalez Update ruby to version v214 ## [0.5.10](https://github.com/gliderlabs/herokuish/compare/v0.5.9...v0.5.10) - 2020-04-01 ### Changed + - @josegonzalez Update ruby to version v213 ## [0.5.9](https://github.com/gliderlabs/herokuish/compare/v0.5.8...v0.5.9) - 2020-03-31 ### Changed + - @josegonzalez Update go to version v139 - @josegonzalez Update nodejs to version v170 - @josegonzalez Update php to version v173 @@ -548,6 +616,7 @@ All notable changes to this project will be documented in this file. ## [0.5.8](https://github.com/gliderlabs/herokuish/compare/v0.5.7...v0.5.8) - 2020-03-16 ### Changed + - @josegonzalez Update go to version v138 - @josegonzalez Update python to version v166 - @josegonzalez Update ruby to version v211 @@ -555,6 +624,7 @@ All notable changes to this project will be documented in this file. ## [0.5.7](https://github.com/gliderlabs/herokuish/compare/v0.5.6...v0.5.7) - 2020-02-02 ### Changed + - @dependabot Bump django from 1.11.23 to 1.11.28 - @josegonzalez Update go to version v137 - @josegonzalez Update php to version v172 @@ -563,6 +633,7 @@ All notable changes to this project will be documented in this file. ## [0.5.6](https://github.com/gliderlabs/herokuish/compare/v0.5.5...v0.5.6) - 2019-12-20 ### Changed + - @josegonzalez Update nodejs to version v167 - @josegonzalez Update php to version v169 - @josegonzalez Update python to version v163 @@ -571,6 +642,7 @@ All notable changes to this project will be documented in this file. ## [0.5.5](https://github.com/gliderlabs/herokuish/compare/v0.5.4...v0.5.5) - 2019-12-20 ### Changed + - @josegonzalez Update go to version v136 - @josegonzalez Update java to version v66 - @josegonzalez Update nodejs to version v166 @@ -582,6 +654,7 @@ All notable changes to this project will be documented in this file. ## [0.5.4](https://github.com/gliderlabs/herokuish/compare/v0.5.3...v0.5.4) - 2019-12-04 ### Changed + - @josegonzalez Update go to version v135 - @josegonzalez Update gradle to version v31 - @josegonzalez Update java to version v65 @@ -592,12 +665,14 @@ All notable changes to this project will be documented in this file. - @josegonzalez Update scala to version v86 ### Fixed + - @michaelshobbs Use ruby 2.6.2 with fixed bundler - dependabot: Update various test app dependencies ## [0.5.3](https://github.com/gliderlabs/herokuish/compare/v0.5.2...v0.5.3) - 2019-08-19 ### Changed + - @josegonzalez Update clojure to version v84 - @josegonzalez Update nodejs to version v161 - @josegonzalez Update php to version v159 @@ -606,6 +681,7 @@ All notable changes to this project will be documented in this file. ## [0.5.2](https://github.com/gliderlabs/herokuish/compare/v0.5.1...v0.5.2) - 2019-07-29 ### Changed + - @josegonzalez Update go to version v126 - @josegonzalez Update nodejs to version v158 - @josegonzalez Update php to version v154 @@ -613,9 +689,11 @@ All notable changes to this project will be documented in this file. ## [0.5.1](https://github.com/gliderlabs/herokuish/compare/v0.5.0...v0.5.1) - 2019-07-05 ### Added + - @josegonzalez Use go modules ### Changed + - @josegonzalez Allow using an system bash via BASH_BIN - @josegonzalez Correct outdated dependencies - @josegonzalez Update go to version v119 @@ -630,11 +708,13 @@ All notable changes to this project will be documented in this file. ## [0.5.0](https://github.com/gliderlabs/herokuish/compare/v0.4.10...v0.5.0) - 2019-03-14 ### Changed + - @swistaczek Bump heroku stack to Heroku:18 ## [0.4.10](https://github.com/gliderlabs/herokuish/compare/v0.4.9...v0.4.10) - 2019-03-14 ### Changed + - @michaelshobbs Update go to version v104 - @michaelshobbs Update nodejs to version v142 - @michaelshobbs Update php to version v151 @@ -643,6 +723,7 @@ All notable changes to this project will be documented in this file. ## [0.4.9](https://github.com/gliderlabs/herokuish/compare/v0.4.8...v0.4.9) - 2019-03-07 ### Changed + - @tnir Update go to version v102 to support Go 1.12 - @michaelshobbs Update java to version v63 - @michaelshobbs Update nodejs to version v139 @@ -652,6 +733,7 @@ All notable changes to this project will be documented in this file. ## [0.4.8](https://github.com/gliderlabs/herokuish/compare/v0.4.7...v0.4.8) - 2019-02-15 ### Changed + - @nbyl Update gradle buildpack to v28 - @eval Update clojure to version v83 - @josegonzalez Update go to version v100 @@ -663,6 +745,7 @@ All notable changes to this project will be documented in this file. ## [0.4.7](https://github.com/gliderlabs/herokuish/compare/v0.4.6...v0.4.7) - 2019-01-22 ### Changed + - @michaelshobbs Update go to version v99 - @michaelshobbs Update php to version v149 - @michaelshobbs Update ruby to version v198 @@ -670,9 +753,11 @@ All notable changes to this project will be documented in this file. ## [0.4.6](https://github.com/gliderlabs/herokuish/compare/v0.4.5...v0.4.6) - 2018-12-26 ### Fixed + - @HillLiu update golang to 1.11.2 for docker build ### Changed + - @josegonzalez Update go to version v98 - @josegonzalez Update nodejs to version v134 - @josegonzalez Update python to version v146 @@ -684,6 +769,7 @@ All notable changes to this project will be documented in this file. ## [0.4.5](https://github.com/gliderlabs/herokuish/compare/v0.4.4...v0.4.5) - 2018-10-26 ### Changed + - @michaelshobbs Update nodejs to version v130 fb65b5a - @michaelshobbs Update python to version v144 bfabe39 - @michaelshobbs Update go to version v94 ccd7e67 @@ -693,6 +779,7 @@ All notable changes to this project will be documented in this file. ## [0.4.4](https://github.com/gliderlabs/herokuish/compare/v0.4.3...v0.4.4) - 2018-08-20 ### Changed + - @natanrolnik Remove .git directory deletion upon build pack installation - @michaelshobbs Update go to version v90 - @michaelshobbs Update php to version v143 @@ -702,6 +789,7 @@ All notable changes to this project will be documented in this file. ## [0.4.3](https://github.com/gliderlabs/herokuish/compare/v0.4.2...v0.4.3) - 2018-07-03 ### Changed + - @webknjaz Upgrade python support to v3.7.0 - @michaelshobbs Update go to version v89 - @michaelshobbs Update gradle to version v27 @@ -711,6 +799,7 @@ All notable changes to this project will be documented in this file. - @michaelshobbs Update scala to version v82 ## [0.4.2](https://github.com/gliderlabs/herokuish/compare/v0.4.1...v0.4.2) - 2018-05-10 + - @peterhellberg Update go to version v87 - @michaelshobbs Update clojure to version v82 - @michaelshobbs Update gradle to version v26 @@ -723,6 +812,7 @@ All notable changes to this project will be documented in this file. ## [0.4.1](https://github.com/gliderlabs/herokuish/compare/v0.4.0...v0.4.1) - 2018-04-23 ### Changed + - @nolith Update java to version v60 - @michaelshobbs Update go to version v86 - @michaelshobbs Update nodejs to version v123 @@ -733,12 +823,14 @@ All notable changes to this project will be documented in this file. ## [0.4.0](https://github.com/gliderlabs/herokuish/compare/v0.3.36...v0.4.0) - 2018-03-10 ### Changed + - @michaelshobbs pin docker version for local build target - @iSDP move base image to heroku16 - @miyucy Respect STACK envvar - @michaelshobbs use newer version of ruby compatible with heroku-16 in test apps ### Removed + - @michaelshobbs remove erlang from buildpack bundle **NOTE: v0.4.0 is now based on heroku-16** @@ -746,6 +838,7 @@ All notable changes to this project will be documented in this file. ## [0.3.36](https://github.com/gliderlabs/herokuish/compare/v0.3.35...v0.3.36) - 2018-03-10 ### Changed + - @josegonzalez fix: retrieve only valid process types - @michaelshobbs Update ruby to version v174 - @michaelshobbs Update python to version v124 @@ -758,18 +851,22 @@ All notable changes to this project will be documented in this file. ## [0.3.35](https://github.com/gliderlabs/herokuish/compare/v0.3.34...v0.3.35) - 2018-02-09 ### Added + - @davidkarlsen Be able to opt out from setuidgid - needed when not running as root initially ### Changed + - @michaelshobbs Update go to version v83 - @michaelshobbs Update nodejs to version v118 ## [0.3.34](https://github.com/gliderlabs/herokuish/compare/v0.3.33...v0.3.34) - 2018-01-30 ### Added + - @josegonzalez feat: update all installed service dependencies when building the docker image ### Changed + - @josegonzalez Update ruby to version v173 - @josegonzalez Update python to version v123 - @josegonzalez Update clojure to version v78 @@ -783,6 +880,7 @@ All notable changes to this project will be documented in this file. ## [0.3.33](https://github.com/gliderlabs/herokuish/compare/v0.3.32...v0.3.33) - 2017-11-01 ### Changed + - @miyucy Update ruby version to v170 - @Shelnutt2 Update go to v78 for go dep support - @michaelshobbs Update gradle to version v24 @@ -793,11 +891,13 @@ All notable changes to this project will be documented in this file. - @michaelshobbs Update scala to version v79 ### Added + - @miyucy Add task to bump up buildpacks version ## [0.3.32](https://github.com/gliderlabs/herokuish/compare/v0.3.31...v0.3.32) - 2017-08-29 ### Changed + - @miyucy Update ruby version to v168 - @miyucy Update nodejs to version v110 - @michaelshobbs Update clojure to version v77 @@ -813,6 +913,7 @@ All notable changes to this project will be documented in this file. - @michaelshobbs use circleci 2.0 machine executor ### Added + - @dzaporozhets Add support for buildpack test command - @michaelshobbs add stickler-ci - @michaelshobbs add linting and fix lintballs @@ -823,11 +924,13 @@ All notable changes to this project will be documented in this file. - @dzaporozhets Add buildpack test to readme and changelog ### Removed + - @michaelshobbs drop grails 2 buildpack per heroku ## [0.3.31](https://github.com/gliderlabs/herokuish/compare/v0.3.30...v0.3.31) - 2017-06-21 ### Changed + - @michaelshobbs Update go to version v69 - @michaelshobbs Update ruby to version v163 - @michaelshobbs Update java to version v52 @@ -837,25 +940,32 @@ All notable changes to this project will be documented in this file. ## [0.3.30](https://github.com/gliderlabs/herokuish/compare/v0.3.29...v0.3.30) - 2017-06-21 ### Fixed + - @karanthukral Added error handling for when Procfile does not define the process being used ### Changed + - @webknjaz Upgrade python buildpack to v109 - @michaelshobbs fix python tests with new buildpack ## [0.3.29](https://github.com/gliderlabs/herokuish/compare/v0.3.28...v0.3.29) - 2017-05-03 + ### Fixed + - @alexquick [build] fix old .env parsing to handle quotes and escapes better cce259c ### Changed + - @michaelshobbs Update ruby to version v159 ## [0.3.28](https://github.com/gliderlabs/herokuish/compare/v0.3.27...v0.3.28) - 2017-04-19 ### Fixed + - @dmgr bugfix: curl may fail to fetch not quoted url if behind proxy ### Changed + - @rvalyi doc: proper reference to Heroku Cedar base image - @michaelshobbs Update go to version v64 - @michaelshobbs Update nodejs to version v99 @@ -865,11 +975,13 @@ All notable changes to this project will be documented in this file. ## [0.3.27](https://github.com/gliderlabs/herokuish/compare/v0.3.26...v0.3.27) - 2017-03-21 ### Changed + - @michaelshobbs Update ruby to version v155 ## [0.3.26](https://github.com/gliderlabs/herokuish/compare/v0.3.25...v0.3.26) - 2017-02-28 ### Changed + - @wfarr Update go buildpack to v62 - @michaelshobbs Update java to version v51 - @michaelshobbs Update php to version v120 @@ -879,6 +991,7 @@ All notable changes to this project will be documented in this file. ## [0.3.25](https://github.com/gliderlabs/herokuish/compare/v0.3.24...v0.3.25) - 2017-02-01 ### Changed + - @fjorgemota Update buildpack-php to v119 - @michaelshobbs Update clojure to version v76 - @michaelshobbs Update go to version v60 @@ -891,6 +1004,7 @@ All notable changes to this project will be documented in this file. ## [0.3.24](https://github.com/gliderlabs/herokuish/compare/v0.3.23...v0.3.24) - 2017-01-02 ### Changed + - @michaelshobbs Update static to version v8 - @michaelshobbs Update python to version v97 - @michaelshobbs Update ruby to version v150 @@ -898,6 +1012,7 @@ All notable changes to this project will be documented in this file. ## [0.3.23](https://github.com/gliderlabs/herokuish/compare/v0.3.22...v0.3.23) - 2016-12-16 ### Changed + - @joshmanders Update nodejs version v93 - @michaelshobbs Update go to version v54 - @michaelshobbs Update gradle to version v19 @@ -907,9 +1022,11 @@ All notable changes to this project will be documented in this file. ## [0.3.22](https://github.com/gliderlabs/herokuish/compare/v0.3.21...v0.3.22) - 2016-11-18 ### Removed + - @michaelshobbs remove html2text dependency ### Changed + - @michaelshobbs changelog header correction for 0.3.21 - @michaelshobbs Update java to version v48 - @michaelshobbs Update ruby to version v148 @@ -918,13 +1035,17 @@ All notable changes to this project will be documented in this file. ## [0.3.21](https://github.com/gliderlabs/herokuish/compare/v0.3.20...v0.3.21) - 2016-11-14 ### Fixed + - @michaelshobbs skip blank lines in .env. closes #195 ### Removed + - @michaelshobbs remove emberjs buildpack from default set ## [0.3.20](https://github.com/gliderlabs/herokuish/compare/v0.3.19...v0.3.20) - 2016-11-13 + ### Changed + - @michaelshobbs new .env parser that handles spaces - @michaelshobbs change readme instructions to use github releases - @michaelshobbs Update go to version v52 @@ -934,6 +1055,7 @@ All notable changes to this project will be documented in this file. ## [0.3.19](https://github.com/gliderlabs/herokuish/compare/v0.3.18...v0.3.19) - 2016-09-20 ### Changed + - @josegonzalez Update static buildpack to v6 - @michaelshobbs Update gradle to version v18 - @michaelshobbs Update java to version v46 @@ -943,6 +1065,7 @@ All notable changes to this project will be documented in this file. ## [0.3.18](https://github.com/gliderlabs/herokuish/compare/v0.3.17...v0.3.18) - 2016-07-29 ### Changed + - @xtian Don't print .release file during build - @michaelshobbs Update php to version v109 - @michaelshobbs Update go to version v44 @@ -951,19 +1074,23 @@ All notable changes to this project will be documented in this file. ## [0.3.17](https://github.com/gliderlabs/herokuish/compare/v0.3.16...v0.3.17) - 2016-07-14 ### Fixed + - @michaelshobbs set unprivileged user/group to same name and test with this user ## [0.3.16](https://github.com/gliderlabs/herokuish/compare/v0.3.15...v0.3.16) - 2016-07-14 ### Added + - @michaelshobbs add named unprivileged user ## [0.3.15](https://github.com/gliderlabs/herokuish/compare/v0.3.14...v0.3.15) - 2016-07-14 ### Fixed + - @joshmanders only delete $app_path if $import_path is not empty. fixes #111 ### Changed + - @michaelshobbs Update go to version v42 - @michaelshobbs Update nodejs to version v91 - @michaelshobbs Update php to version v108 @@ -973,12 +1100,15 @@ All notable changes to this project will be documented in this file. ## [0.3.14](https://github.com/gliderlabs/herokuish/compare/v0.3.13...v0.3.14) - 2016-06-27 ### Added + - @michaelshobbs implement heroku-like buildpack detect order and output. closes #133 ### Fixed + - @michaelshobbs because nodejs matches before ember, manually set the ember buildpack ### Changed + - @michaelshobbs Update go to version v41 - @michaelshobbs Update grails to version v21 - @michaelshobbs Update php to version v107 @@ -986,22 +1116,27 @@ All notable changes to this project will be documented in this file. ## [0.3.13](https://github.com/gliderlabs/herokuish/compare/v0.3.12...v0.3.13) - 2016-05-09 ### Fixed + - @michaelshobbs ensure correct permissions on tgz buildpack directories ### Changed + - @michaelshobbs Update php to version v102 - @michaelshobbs Update go to version v36 ## [0.3.12](https://github.com/gliderlabs/herokuish/compare/v0.3.11...v0.3.12) - 2016-04-27 ### Fixed + - @michaelshobbs try testing port more times before continuing. add output when testing for a listener - @michaelshobbs increase retry in an attempt to allow the (ember specifially) app to fully startup ### Added + - @michaelshobbs support compressed tarball buildpacks (#144) ### Changed + - @michaelshobbs Update go to version v34 - @michaelshobbs Update nodejs to version v90 - @michaelshobbs Update php to version v101 @@ -1010,12 +1145,14 @@ All notable changes to this project will be documented in this file. ## [0.3.11](https://github.com/gliderlabs/herokuish/compare/v0.3.10...v0.3.11) - 2016-04-07 ### Changed + - @michaelshobbs Update php to version v100 (#140) - @michaelshobbs Update python to version v80 (#141) ## [0.3.10](https://github.com/gliderlabs/herokuish/compare/v0.3.9...v0.3.10) - 2016-03-30 ### Changed + - @michaelshobbs Update nodejs to version v89 - @michaelshobbs Update php to version v99 - @michaelshobbs Update python to version v79 @@ -1025,12 +1162,15 @@ All notable changes to this project will be documented in this file. ## [0.3.9](https://github.com/gliderlabs/herokuish/compare/v0.3.8...v0.3.9) - 2016-03-08 ### Fixed + - @graphaelli clean up link warning ### Added + - @michaelshobbs extract config_vars from .release ### Changed + - @singlow singlow use find to identify only files not already owned by user - @michaelshobbs Update clojure to version v75 - @michaelshobbs Update grails to version v20 @@ -1047,6 +1187,7 @@ All notable changes to this project will be documented in this file. ## [0.3.8](https://github.com/gliderlabs/herokuish/compare/v0.3.7...v0.3.8) - 2016-01-06 ### Changed + - @josegonzalez Upgrade gradle buildpack version to 17 - @josegonzalez Update java buildpack version to 42 - @josegonzalez Update scala buildpack version to 64 @@ -1054,13 +1195,16 @@ All notable changes to this project will be documented in this file. ## [0.3.7](https://github.com/gliderlabs/herokuish/compare/v0.3.6...v0.3.7) - 2015-12-31 ### Fixed + - @michaelshobbs force rebuild of packages that are already up to date - @michaelshobbs fix buildpack version output after adding dokku/buildpack-nginx ### Removed + - @michaelshobbs remove unnecessary null line check ### Changed + - @michaelshobbs re-implement yaml-get and yaml-keys in bash - @CEikermann Updated buildpack-php to v90 - @josegonzalez Upgrade python buildpack to v74 @@ -1068,6 +1212,7 @@ All notable changes to this project will be documented in this file. ## [0.3.6](https://github.com/gliderlabs/herokuish/compare/v0.3.5...v0.3.6) - 2015-12-14 ### Changed + - Update php buildpack to version 87 - Update clojure buildpack to version 73 - Update golang buildpack to version 22 @@ -1081,16 +1226,20 @@ All notable changes to this project will be documented in this file. ## [0.3.5](https://github.com/gliderlabs/herokuish/compare/v0.3.4...v0.3.5) - 2015-11-25 ### Added + - Add static buildpack and test ### Changed - - Increased CURL_TIMEOUT env var in buildpacks from the default 30 to 180 - - Update python buildpack to v70 - - Update static buildpack to v5 - - Update local build env to docker 1.9.1 + +- Increased CURL_TIMEOUT env var in buildpacks from the default 30 to 180 +- Update python buildpack to v70 +- Update static buildpack to v5 +- Update local build env to docker 1.9.1 ## [0.3.4](https://github.com/gliderlabs/herokuish/compare/v0.3.3...v0.3.4) - 2015-10-23 + ### Changed + - Upgrade clojure buildpack to version 70 - Update go buildpack to version 18 - Update java buildpack to version 40 @@ -1103,18 +1252,22 @@ All notable changes to this project will be documented in this file. ## [0.3.3](https://github.com/gliderlabs/herokuish/compare/v0.3.2...v0.3.3) - 2015-09-10 ### Added + - Use exec to run procfile entries - Throw error when detect fails in custom buildpack ### Changed + - Bumped scala buildpack to v60 ## [0.3.2](https://github.com/gliderlabs/herokuish/compare/v0.3.1...v0.3.2) - 2015-07-28 ### Added + - Repo Analytics to README ### Changed + - Bumped golang buildpack to fa0679c - Bumped php buildpack to version 70 - Bumped clojure buildpack to version 67 @@ -1128,35 +1281,43 @@ All notable changes to this project will be documented in this file. ## [0.3.1](https://github.com/gliderlabs/herokuish/compare/v0.3.0...v0.3.1) - 2015-07-09 ### Fixed + - Fixed directory permission for custom buildpacks ### Added + - Added ability to build in docker container ### Removed + - Remove testing play-v1 from play buildpack ### Changed + - Build from mainline heroku/cedar:14 docker images - Bump nodejs/scala buildpack versions ## [0.3.0](https://github.com/gliderlabs/herokuish/compare/v0.2.0...v0.3.0) - 2015-04-04 ### Fixed + - Fixed Scala buildpack and app test - Fixed collision issue with `VERSION` environment variable ### Added + - Added Dockerfile making Herokuish an alternative for Buildstep - Added `PS1` and source `/etc/profile.d` like Buildstep - Added `IMPORT_PATH` to copy to `APP_PATH` for untouched mounted apps - Added `herokuish test` command for testing apps against Herokuish ### Removed + - Dropped shunit2 for [basht](https://github.com/progrium/basht) - Dropped cedarish cache and release tracking ### Changed + - *Significantly* reduced complexity of testing setup - Moved buildpack versions and app tests to `buildpacks` directory - Prepared for automated tracking branches for latest buildpacks @@ -1164,6 +1325,7 @@ All notable changes to this project will be documented in this file. ## [0.2.0](https://github.com/gliderlabs/herokuish/compare/v0.1.0...v0.2.0) - 2015-02-10 ### Fixed + - Fixed CI issue with `go get` on CircleCI - Updated go-basher usage to latest API - Buildpack setup uses `$unprivileged_user` instead of hardcoded `nobody` @@ -1171,15 +1333,18 @@ All notable changes to this project will be documented in this file. - Default buildpack process types added to a created Procfile ### Added + - Buildpack clones try to be shallow - Ability to set `$unprivileged_user` with `$USER` - Grails buildpack support and test app - Play (v1) test app #### Removed + - Dropped bindata.go from repo #### Changed + - Updated to latest buildpack releases - User for `buildpack-build` is `$USER` or randomized - User for `procfile-exec` is `$USER` or detected from `/app` diff --git a/Makefile b/Makefile index 3d3834509..2239f9b53 100644 --- 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.7.2 +VERSION ?= 0.7.3 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 17be01cb8..c978d5252 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.7.2-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.3-blue)](https://hub.docker.com/r/gliderlabs/herokuish) A command line tool for emulating Heroku build and runtime tasks in containers. @@ -19,8 +19,8 @@ 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.7.2/herokuish_0.7.2_linux_x86_64.tgz \ - | tar -xzC /bin +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.3/herokuish_0.7.3_linux_x86_64.tgz \ + | tar -xzC /bin ``` Herokuish depends on Bash (4.0 or newer) and a handful of standard GNU utilties you probably have. It likely won't work on Busybox, though neither will any Heroku buildpacks. From 53ee01b6e82527ab5b56942af3eae83099571995 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 31 Jan 2024 11:11:41 +0000 Subject: [PATCH 393/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.8 to 3.0.9. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.8...v3.0.9) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 7b6f5f7b7..ebfbc7c12 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.8) + rack (3.0.9) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 701807d3d9c1b68ec8ce1eeb9ee1f07b3394b037 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:03:46 +0000 Subject: [PATCH 394/871] chore(deps): bump markupsafe Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.4 to 2.1.5. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.4...2.1.5) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index d221a5ce9..b3ce0328e 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.4 +markupsafe==2.1.5 From b154f42b3ac41a873ed9be7cd5df25632d76634e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:03:50 +0000 Subject: [PATCH 395/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.1...3.0.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index d221a5ce9..a87633626 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.1 +Flask==3.0.2 Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.4 From b62ed6f1809a324a0f3508c1908ce3ca6b0d734b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:18:57 +0000 Subject: [PATCH 396/871] chore(deps): bump markupsafe in /buildpacks/buildpack-multi/tests/multi Bumps [markupsafe](https://github.com/pallets/markupsafe) from 2.1.4 to 2.1.5. - [Release notes](https://github.com/pallets/markupsafe/releases) - [Changelog](https://github.com/pallets/markupsafe/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/markupsafe/compare/2.1.4...2.1.5) --- updated-dependencies: - dependency-name: markupsafe dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index d221a5ce9..b3ce0328e 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.1 Jinja2==3.1.3 gunicorn==21.2.0 -markupsafe==2.1.4 +markupsafe==2.1.5 From 0e48e50014532806978422ba7d845a0041ec6eda Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Feb 2024 11:19:00 +0000 Subject: [PATCH 397/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 3.0.1 to 3.0.2. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.1...3.0.2) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index d221a5ce9..a87633626 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.1 +Flask==3.0.2 Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.4 From b90ba9daa4116596528f19bd16914331130093bb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 6 Feb 2024 13:38:23 +0000 Subject: [PATCH 398/871] Update nodejs to version v236 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a2f544cdf..6fdce0bc6 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v235 +v236 From 9b266afcb269711da9bc1cc0ed9b3675ada9b16f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 7 Feb 2024 13:38:27 +0000 Subject: [PATCH 399/871] Update python to version v243 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 8ba02379b..6b1dadddb 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v242 +v243 From 915233b244c05b0734dc10321954069313761338 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 7 Feb 2024 13:38:29 +0000 Subject: [PATCH 400/871] Update scala to version v97 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index ae2994c2d..3b3c3a3d6 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v96 +v97 From 66866d606ffc2c003a48c55b3e45359ab0e1afe3 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 8 Feb 2024 21:53:32 +0000 Subject: [PATCH 401/871] Update go to version v187 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 3ecae9401..0aa90fcc7 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v184 +v187 From e52dac8f6974c845879993c701e412981e7f0f3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Feb 2024 00:58:28 +0000 Subject: [PATCH 402/871] chore(deps): bump golang from 1.21 to 1.22 Bumps golang from 1.21 to 1.22. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f07005127..a2647c365 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=20 -FROM golang:1.21 AS builder +FROM golang:1.22 AS builder RUN mkdir /src ADD . /src/ WORKDIR /src From d0358631c125acc6f2c6437e4ebe689cc530a145 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 9 Feb 2024 13:38:14 +0000 Subject: [PATCH 403/871] Update php to version v246 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 1e48f7666..425584232 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v244 +v246 From 996c7c6927b5cae92027775fc4a8a698217d8aed Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 25 Feb 2024 12:32:05 -0500 Subject: [PATCH 404/871] feat: upgrade to ruby 3.3 This should help fix issues with installing ruby dependencies for fpm --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 14ee036fd..f60747b8e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.3 - uses: actions/setup-python@v5 with: From 0a55616d47e0496529fb2e60145a4d308ce91172 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:25:09 +0000 Subject: [PATCH 405/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.9 to 3.0.9.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.9...v3.0.9.1) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index ebfbc7c12..90e061b53 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.9) + rack (3.0.9.1) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From a09b21747b867570d08c68180781027548f395fa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:25:12 +0000 Subject: [PATCH 406/871] chore(deps-dev): bump test-unit Bumps [test-unit](https://github.com/test-unit/test-unit) from 3.6.1 to 3.6.2. - [Release notes](https://github.com/test-unit/test-unit/releases) - [Commits](https://github.com/test-unit/test-unit/compare/3.6.1...3.6.2) --- updated-dependencies: - dependency-name: test-unit dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 6fd662768..986934217 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -21,7 +21,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-protection (= 3.2.0) tilt (~> 2.0) - test-unit (3.6.1) + test-unit (3.6.2) power_assert tilt (2.3.0) From 941bfaf829c0ab4c2ea65f91ca816eefcd64fb86 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 25 Feb 2024 19:25:35 +0000 Subject: [PATCH 407/871] Update ruby to version v266 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index f0d48c716..605a2b40e 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v265 +v266 From 7b7014eeb0889b21ab76c0409d2e8ba6dc79c708 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 25 Feb 2024 19:25:37 +0000 Subject: [PATCH 408/871] Update nodejs to version v237 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 6fdce0bc6..529193d15 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v236 +v237 From 4ede0de08cb56625a7af0aa344a1d64900eee5b6 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sun, 25 Feb 2024 19:25:39 +0000 Subject: [PATCH 409/871] Update scala to version v98 --- buildpacks/buildpack-scala/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/buildpack-version b/buildpacks/buildpack-scala/buildpack-version index 3b3c3a3d6..509525dfc 100644 --- a/buildpacks/buildpack-scala/buildpack-version +++ b/buildpacks/buildpack-scala/buildpack-version @@ -1 +1 @@ -v97 +v98 From 61391c348cf26753a1e5dafd2d1d2625a217ce6e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 25 Feb 2024 14:31:41 -0500 Subject: [PATCH 410/871] feat: add ability for users to disable the chown process on container start If the container files in the APP_PATH are already chowned by the herokuishuser during image creation, there is no need to perform the task again on each container start. --- include/procfile.bash | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/include/procfile.bash b/include/procfile.bash index f6454c1b9..431a77389 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -118,8 +118,10 @@ procfile-load-profile() { procfile-setup-home() { export HOME="$app_path" - usermod --home "$app_path" "$unprivileged_user" > /dev/null 2>&1 - # unprivileged_user & unprivileged_group are defined in outer scope - # shellcheck disable=SC2154 - find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" + usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 + if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then + # unprivileged_user & unprivileged_group are defined in outer scope + # shellcheck disable=SC2154 + find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" + fi } From 147b65177bc5cb5fdf56c6a96424ecdc37c7ab34 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 25 Feb 2024 19:54:14 +0000 Subject: [PATCH 411/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 2.2.8 to 2.2.8.1. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8...v2.2.8.1) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 986934217..e8cfe5121 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (2.2.8) + rack (2.2.8.1) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) From 3e472c1d7af4ca9e48eba54b28cc9d33a3dbed48 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 29 Feb 2024 13:38:32 +0000 Subject: [PATCH 412/871] Update ruby to version v267 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 605a2b40e..cc71c451b 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v266 +v267 From d95c9a6c975bdcf0db192b47454f395afe4e0204 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 29 Feb 2024 13:38:39 +0000 Subject: [PATCH 413/871] Update go to version v188 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 0aa90fcc7..930f7dd17 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v187 +v188 From c33bdbb569bcce7a66acba71b1d28420eff636d0 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 1 Mar 2024 13:38:22 +0000 Subject: [PATCH 414/871] Update php to version v247 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 425584232..d0a08b740 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v246 +v247 From 6a68283b6323fcacb8f08f2dac8e8de990dda712 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 4 Mar 2024 23:47:00 -0500 Subject: [PATCH 415/871] Release 0.7.4 - #1120 @dependabot: chore(deps): bump rack from 3.0.8 to 3.0.9 in /buildpacks/buildpack-multi/tests/multi - #1121 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-python/tests/python-flask - #1122 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-python/tests/python-flask - #1123 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-multi/tests/multi - #1124 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-multi/tests/multi - #1125 @dokku-bot: Update nodejs to version v236 - #1126 @dependabot: chore(deps): bump golang from 1.21 to 1.22 - #1127 @dokku-bot: Update python to version v243 - #1128 @dokku-bot: Update scala to version v97 - #1130 @dokku-bot: Update go to version v187 - #1131 @dokku-bot: Update php to version v246 - #1133 @dependabot: chore(deps-dev): bump test-unit from 3.6.1 to 3.6.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1136 @dependabot: chore(deps): bump rack from 3.0.9 to 3.0.9.1 in /buildpacks/buildpack-multi/tests/multi - #1137 @dependabot: chore(deps): bump rack from 2.2.8 to 2.2.8.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1138 @josegonzalez: Upgrade to ruby 3.3 in CI - #1139 @dokku-bot: Update ruby to version v266 - #1140 @dokku-bot: Update nodejs to version v237 - #1141 @dokku-bot: Update scala to version v98 - #1142 @josegonzalez: Add ability for users to disable the chown process on container start - #1143 @dokku-bot: Update ruby to version v267 - #1144 @dokku-bot: Update go to version v188 - #1145 @dokku-bot: Update php to version v247 --- CHANGELOG.md | 25 +++++++++++++++++++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 02b0e5b96..0a1efef20 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,31 @@ All notable changes to this project will be documented in this file. +## [0.7.4](https://github.com/gliderlabs/herokuish/compare/v0.7.3...v0.7.4) - 2024-04-4 + +- #1120 @dependabot: chore(deps): bump rack from 3.0.8 to 3.0.9 in /buildpacks/buildpack-multi/tests/multi +- #1121 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-python/tests/python-flask +- #1122 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-python/tests/python-flask +- #1123 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-multi/tests/multi +- #1124 @dependabot: chore(deps): bump flask from 3.0.1 to 3.0.2 in /buildpacks/buildpack-multi/tests/multi +- #1125 @dokku-bot: Update nodejs to version v236 +- #1126 @dependabot: chore(deps): bump golang from 1.21 to 1.22 +- #1127 @dokku-bot: Update python to version v243 +- #1128 @dokku-bot: Update scala to version v97 +- #1130 @dokku-bot: Update go to version v187 +- #1131 @dokku-bot: Update php to version v246 +- #1133 @dependabot: chore(deps-dev): bump test-unit from 3.6.1 to 3.6.2 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1136 @dependabot: chore(deps): bump rack from 3.0.9 to 3.0.9.1 in /buildpacks/buildpack-multi/tests/multi +- #1137 @dependabot: chore(deps): bump rack from 2.2.8 to 2.2.8.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1138 @josegonzalez: Upgrade to ruby 3.3 in CI +- #1139 @dokku-bot: Update ruby to version v266 +- #1140 @dokku-bot: Update nodejs to version v237 +- #1141 @dokku-bot: Update scala to version v98 +- #1142 @josegonzalez: Add ability for users to disable the chown process on container start +- #1143 @dokku-bot: Update ruby to version v267 +- #1144 @dokku-bot: Update go to version v188 +- #1145 @dokku-bot: Update php to version v247 + ## [0.7.3](https://github.com/gliderlabs/herokuish/compare/v0.7.2...v0.7.3) - 2024-01-29 - #1060 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-multi/tests/multi diff --git a/Makefile b/Makefile index 2239f9b53..f83370dbf 100644 --- 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.7.3 +VERSION ?= 0.7.4 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index c978d5252..b9ceb7bb1 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.7.3-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.4-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.7.3/herokuish_0.7.3_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.4/herokuish_0.7.4_linux_x86_64.tgz \ | tar -xzC /bin ``` From 3d6ad920716e3afb6a7377ad035c0cda4ec5e614 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 7 Mar 2024 13:38:21 +0000 Subject: [PATCH 416/871] Update go to version v189 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 930f7dd17..306e236c7 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v188 +v189 From c9589067acdb06d817cdf9749a6bd3d749c8a471 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 8 Mar 2024 13:38:16 +0000 Subject: [PATCH 417/871] Update nodejs to version v238 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 529193d15..e3b78e361 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v237 +v238 From ede30c6dd5e470802875ca47697c3dc6d603b513 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 26 Mar 2024 00:41:46 -0400 Subject: [PATCH 418/871] chore: update ruby in ci to latest version to fix releases --- .github/workflows/tag-release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 4f50ac7e7..5c8455449 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -30,7 +30,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.3 - name: set up qemu uses: docker/setup-qemu-action@v3 @@ -65,7 +65,7 @@ jobs: - uses: ruby/setup-ruby@v1 with: - ruby-version: 2.7 + ruby-version: 3.3 - name: download packages uses: actions/download-artifact@v3 From 324c2cbc96a23982790a47b6e7dcf5f5cd38088b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Tue, 26 Mar 2024 01:54:31 -0400 Subject: [PATCH 419/871] fix: vendor build directory to fix builds The upstream heroku/base-images switched to using a RUN mount and removed the inlining of certain files, causing build failures for gliderlabs/herokuish when executing their install scripts. To fix this, we _also_ vendor those files. Additionally, update the removal of postgresql from 15 to 16 to fix issues with building on arm. --- Dockerfile | 1 + bin/setup.sh | 8 +-- build-deps/20/imagemagick-policy.xml | 13 +++++ build-deps/20/postgresql-ACCC4CF8.asc | 77 +++++++++++++++++++++++++++ build-deps/22/imagemagick-policy.xml | 13 +++++ build-deps/22/postgresql-ACCC4CF8.asc | 77 +++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 4 deletions(-) create mode 100644 build-deps/20/imagemagick-policy.xml create mode 100644 build-deps/20/postgresql-ACCC4CF8.asc create mode 100644 build-deps/22/imagemagick-policy.xml create mode 100644 build-deps/22/postgresql-ACCC4CF8.asc diff --git a/Dockerfile b/Dockerfile index a2647c365..4857388ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,6 +16,7 @@ ARG TARGETARCH ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh /tmp/setup-02.sh ADD bin/setup.sh /tmp/setup.sh +ADD build-deps/${STACK_VERSION} /build RUN STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ rm -rf /tmp/setup.sh diff --git a/bin/setup.sh b/bin/setup.sh index f0be93b39..5f077cd7d 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -7,7 +7,7 @@ setup_01="$(cat /tmp/setup-01.sh)" setup_02="$(cat /tmp/setup-02.sh)" # write the first script -echo "$setup_01" > /tmp/setup-01.sh +echo "$setup_01" >/tmp/setup-01.sh chmod +x /tmp/setup-01.sh # Ensure we install from ports for arm/arm64 systems @@ -19,7 +19,7 @@ fi # Skip unsupported postgresql on arm:20 if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-client-15/d' /tmp/setup-01.sh + sed -i '/postgresql-client-16/d' /tmp/setup-01.sh fi # from base image @@ -38,12 +38,12 @@ rm -rf /var/cache/apt/archives/*.deb rm -rf /var/lib/apt/lists/* # write the second script -echo "$setup_02" > /tmp/setup-02.sh +echo "$setup_02" >/tmp/setup-02.sh chmod +x /tmp/setup-02.sh # Skip unsupported postgresql on arm:20 if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-server-dev-15/d' /tmp/setup-02.sh + sed -i '/postgresql-server-dev-16/d' /tmp/setup-02.sh fi # from build image diff --git a/build-deps/20/imagemagick-policy.xml b/build-deps/20/imagemagick-policy.xml new file mode 100644 index 000000000..18cd3b36d --- /dev/null +++ b/build-deps/20/imagemagick-policy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/build-deps/20/postgresql-ACCC4CF8.asc b/build-deps/20/postgresql-ACCC4CF8.asc new file mode 100644 index 000000000..8480576ec --- /dev/null +++ b/build-deps/20/postgresql-ACCC4CF8.asc @@ -0,0 +1,77 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE6XR8IBEACVdDKT2HEH1IyHzXkb4nIWAY7echjRxo7MTcj4vbXAyBKOfjja +UrBEJWHN6fjKJXOYWXHLIYg0hOGeW9qcSiaa1/rYIbOzjfGfhE4x0Y+NJHS1db0V +G6GUj3qXaeyqIJGS2z7m0Thy4Lgr/LpZlZ78Nf1fliSzBlMo1sV7PpP/7zUO+aA4 +bKa8Rio3weMXQOZgclzgeSdqtwKnyKTQdXY5MkH1QXyFIk1nTfWwyqpJjHlgtwMi +c2cxjqG5nnV9rIYlTTjYG6RBglq0SmzF/raBnF4Lwjxq4qRqvRllBXdFu5+2pMfC +IZ10HPRdqDCTN60DUix+BTzBUT30NzaLhZbOMT5RvQtvTVgWpeIn20i2NrPWNCUh +hj490dKDLpK/v+A5/i8zPvN4c6MkDHi1FZfaoz3863dylUBR3Ip26oM0hHXf4/2U +A/oA4pCl2W0hc4aNtozjKHkVjRx5Q8/hVYu+39csFWxo6YSB/KgIEw+0W8DiTII3 +RQj/OlD68ZDmGLyQPiJvaEtY9fDrcSpI0Esm0i4sjkNbuuh0Cvwwwqo5EF1zfkVj +Tqz2REYQGMJGc5LUbIpk5sMHo1HWV038TWxlDRwtOdzw08zQA6BeWe9FOokRPeR2 +AqhyaJJwOZJodKZ76S+LDwFkTLzEKnYPCzkoRwLrEdNt1M7wQBThnC5z6wARAQAB +tBxQb3N0Z3JlU1FMIERlYmlhbiBSZXBvc2l0b3J5iQJOBBMBCAA4AhsDBQsJCAcD +BRUKCQgLBRYCAwEAAh4BAheAFiEEuXsK/KoaR/BE8kSgf8x9RqzMTPgFAlhtCD8A +CgkQf8x9RqzMTPgECxAAk8uL+dwveTv6eH21tIHcltt8U3Ofajdo+D/ayO53LiYO +xi27kdHD0zvFMUWXLGxQtWyeqqDRvDagfWglHucIcaLxoxNwL8+e+9hVFIEskQAY +kVToBCKMXTQDLarz8/J030Pmcv3ihbwB+jhnykMuyyNmht4kq0CNgnlcMCdVz0d3 +z/09puryIHJrD+A8y3TD4RM74snQuwc9u5bsckvRtRJKbP3GX5JaFZAqUyZNRJRJ +Tn2OQRBhCpxhlZ2afkAPFIq2aVnEt/Ie6tmeRCzsW3lOxEH2K7MQSfSu/kRz7ELf +Cz3NJHj7rMzC+76Rhsas60t9CjmvMuGONEpctijDWONLCuch3Pdj6XpC+MVxpgBy +2VUdkunb48YhXNW0jgFGM/BFRj+dMQOUbY8PjJjsmVV0joDruWATQG/M4C7O8iU0 +B7o6yVv4m8LDEN9CiR6r7H17m4xZseT3f+0QpMe7iQjz6XxTUFRQxXqzmNnloA1T +7VjwPqIIzkj/u0V8nICG/ktLzp1OsCFatWXh7LbU+hwYl6gsFH/mFDqVxJ3+DKQi +vyf1NatzEwl62foVjGUSpvh3ymtmtUQ4JUkNDsXiRBWczaiGSuzD9Qi0ONdkAX3b +ewqmN4TfE+XIpCPxxHXwGq9Rv1IFjOdCX0iG436GHyTLC1tTUIKF5xV4Y0+cXIOI +RgQQEQgABgUCTpdI7gAKCRDFr3dKWFELWqaPAKD1TtT5c3sZz92Fj97KYmqbNQZP ++ACfSC6+hfvlj4GxmUjp1aepoVTo3weJAhwEEAEIAAYFAk6XSQsACgkQTFprqxLS +p64F8Q//cCcutwrH50UoRFejg0EIZav6LUKejC6kpLeubbEtuaIH3r2zMblPGc4i ++eMQKo/PqyQrceRXeNNlqO6/exHozYi2meudxa6IudhwJIOn1MQykJbNMSC2sGUp +1W5M1N5EYgt4hy+qhlfnD66LR4G+9t5FscTJSy84SdiOuqgCOpQmPkVRm1HX5X1+ +dmnzMOCk5LHHQuiacV0qeGO7JcBCVEIDr+uhU1H2u5GPFNHm5u15n25tOxVivb94 +xg6NDjouECBH7cCVuW79YcExH/0X3/9G45rjdHlKPH1OIUJiiX47OTxdG3dAbB4Q +fnViRJhjehFscFvYWSqXo3pgWqUsEvv9qJac2ZEMSz9x2mj0ekWxuM6/hGWxJdB+ ++985rIelPmc7VRAXOjIxWknrXnPCZAMlPlDLu6+vZ5BhFX0Be3y38f7GNCxFkJzl +hWZ4Cj3WojMj+0DaC1eKTj3rJ7OJlt9S9xnO7OOPEUTGyzgNIDAyCiu8F4huLPaT +ape6RupxOMHZeoCVlqx3ouWctelB2oNXcxxiQ/8y+21aHfD4n/CiIFwDvIQjl7dg +mT3u5Lr6yxuosR3QJx1P6rP5ZrDTP9khT30t+HZCbvs5Pq+v/9m6XDmi+NlU7Zuh +Ehy97tL3uBDgoL4b/5BpFL5U9nruPlQzGq1P9jj40dxAaDAX/WKJAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlB5KywFCQPDFt8ACgkQf8x9RqzM +TPhuCQ//QAjRSAOCQ02qmUAikT+mTB6baOAakkYq6uHbEO7qPZkv4E/M+HPIJ4wd +nBNeSQjfvdNcZBA/x0hr5EMcBneKKPDj4hJ0panOIRQmNSTThQw9OU351gm3YQct +AMPRUu1fTJAL/AuZUQf9ESmhyVtWNlH/56HBfYjE4iVeaRkkNLJyX3vkWdJSMwC/ +LO3Lw/0M3R8itDsm74F8w4xOdSQ52nSRFRh7PunFtREl+QzQ3EA/WB4AIj3VohIG +kWDfPFCzV3cyZQiEnjAe9gG5pHsXHUWQsDFZ12t784JgkGyO5wT26pzTiuApWM3k +/9V+o3HJSgH5hn7wuTi3TelEFwP1fNzI5iUUtZdtxbFOfWMnZAypEhaLmXNkg4zD +kH44r0ss9fR0DAgUav1a25UnbOn4PgIEQy2fgHKHwRpCy20d6oCSlmgyWsR40EPP +YvtGq49A2aK6ibXmdvvFT+Ts8Z+q2SkFpoYFX20mR2nsF0fbt1lfH65P64dukxeR +GteWIeNakDD40bAAOH8+OaoTGVBJ2ACJfLVNM53PEoftavAwUYMrR910qvwYfd/4 +6rh46g1Frr9SFMKYE9uvIJIgDsQB3QBp71houU4H55M5GD8XURYs+bfiQpJG1p7e +B8e5jZx1SagNWc4XwL2FzQ9svrkbg1Y+359buUiP7T6QXX2zY++JAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlEqbZUFCQg2wEEACgkQf8x9RqzM +TPhFMQ//WxAfKMdpSIA9oIC/yPD/dJpY/+DyouOljpE6MucMy/ArBECjFTBwi/j9 +NYM4ynAk34IkhuNexc1i9/05f5RM6+riLCLgAOsADDbHD4miZzoSxiVr6GQ3YXMb +OGld9kV9Sy6mGNjcUov7iFcf5Hy5w3AjPfKuR9zXswyfzIU1YXObiiZT38l55pp/ +BSgvGVQsvbNjsff5CbEKXS7q3xW+WzN0QWF6YsfNVhFjRGj8hKtHvwKcA02wwjLe +LXVTm6915ZUKhZXUFc0vM4Pj4EgNswH8Ojw9AJaKWJIZmLyW+aP+wpu6YwVCicxB +Y59CzBO2pPJDfKFQzUtrErk9irXeuCCLesDyirxJhv8o0JAvmnMAKOLhNFUrSQ2m ++3EnF7zhfz70gHW+EG8X8mL/EN3/dUM09j6TVrjtw43RLxBzwMDeariFF9yC+5bL +tnGgxjsB9Ik6GV5v34/NEEGf1qBiAzFmDVFRZlrNDkq6gmpvGnA5hUWNr+y0i01L +jGyaLSWHYjgw2UEQOqcUtTFK9MNzbZze4mVaHMEz9/aMfX25R6qbiNqCChveIm8m +Yr5Ds2zdZx+G5bAKdzX7nx2IUAxFQJEE94VLSp3npAaTWv3sHr7dR8tSyUJ9poDw +gw4W9BIcnAM7zvFYbLF5FNggg/26njHCCN70sHt8zGxKQINMc6SJAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlLpFRkFCQ6EJy0ACgkQf8x9RqzM +TPjOZA//Zp0e25pcvle7cLc0YuFr9pBv2JIkLzPm83nkcwKmxaWayUIG4Sv6pH6h +m8+S/CHQij/yFCX+o3ngMw2J9HBUvafZ4bnbI0RGJ70GsAwraQ0VlkIfg7GUw3Tz +voGYO42rZTru9S0K/6nFP6D1HUu+U+AsJONLeb6oypQgInfXQExPZyliUnHdipei +4WR1YFW6sjSkZT/5C3J1wkAvPl5lvOVthI9Zs6bZlJLZwusKxU0UM4Btgu1Sf3nn +JcHmzisixwS9PMHE+AgPWIGSec/N27a0KmTTvImV6K6nEjXJey0K2+EYJuIBsYUN +orOGBwDFIhfRk9qGlpgt0KRyguV+AP5qvgry95IrYtrOuE7307SidEbSnvO5ezNe +mE7gT9Z1tM7IMPfmoKph4BfpNoH7aXiQh1Wo+ChdP92hZUtQrY2Nm13cmkxYjQ4Z +gMWfYMC+DA/GooSgZM5i6hYqyyfAuUD9kwRN6BqTbuAUAp+hCWYeN4D88sLYpFh3 +paDYNKJ+Gf7Yyi6gThcV956RUFDH3ys5Dk0vDL9NiWwdebWfRFbzoRM3dyGP889a +OyLzS3mh6nHzZrNGhW73kslSQek8tjKrB+56hXOnb4HaElTZGDvD5wmrrhN94kby +Gtz3cydIohvNO9d90+29h0eGEDYti7j7maHkBKUAwlcPvMg5m3Y= +=DA1T +-----END PGP PUBLIC KEY BLOCK----- diff --git a/build-deps/22/imagemagick-policy.xml b/build-deps/22/imagemagick-policy.xml new file mode 100644 index 000000000..f0ab0d662 --- /dev/null +++ b/build-deps/22/imagemagick-policy.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/build-deps/22/postgresql-ACCC4CF8.asc b/build-deps/22/postgresql-ACCC4CF8.asc new file mode 100644 index 000000000..8480576ec --- /dev/null +++ b/build-deps/22/postgresql-ACCC4CF8.asc @@ -0,0 +1,77 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQINBE6XR8IBEACVdDKT2HEH1IyHzXkb4nIWAY7echjRxo7MTcj4vbXAyBKOfjja +UrBEJWHN6fjKJXOYWXHLIYg0hOGeW9qcSiaa1/rYIbOzjfGfhE4x0Y+NJHS1db0V +G6GUj3qXaeyqIJGS2z7m0Thy4Lgr/LpZlZ78Nf1fliSzBlMo1sV7PpP/7zUO+aA4 +bKa8Rio3weMXQOZgclzgeSdqtwKnyKTQdXY5MkH1QXyFIk1nTfWwyqpJjHlgtwMi +c2cxjqG5nnV9rIYlTTjYG6RBglq0SmzF/raBnF4Lwjxq4qRqvRllBXdFu5+2pMfC +IZ10HPRdqDCTN60DUix+BTzBUT30NzaLhZbOMT5RvQtvTVgWpeIn20i2NrPWNCUh +hj490dKDLpK/v+A5/i8zPvN4c6MkDHi1FZfaoz3863dylUBR3Ip26oM0hHXf4/2U +A/oA4pCl2W0hc4aNtozjKHkVjRx5Q8/hVYu+39csFWxo6YSB/KgIEw+0W8DiTII3 +RQj/OlD68ZDmGLyQPiJvaEtY9fDrcSpI0Esm0i4sjkNbuuh0Cvwwwqo5EF1zfkVj +Tqz2REYQGMJGc5LUbIpk5sMHo1HWV038TWxlDRwtOdzw08zQA6BeWe9FOokRPeR2 +AqhyaJJwOZJodKZ76S+LDwFkTLzEKnYPCzkoRwLrEdNt1M7wQBThnC5z6wARAQAB +tBxQb3N0Z3JlU1FMIERlYmlhbiBSZXBvc2l0b3J5iQJOBBMBCAA4AhsDBQsJCAcD +BRUKCQgLBRYCAwEAAh4BAheAFiEEuXsK/KoaR/BE8kSgf8x9RqzMTPgFAlhtCD8A +CgkQf8x9RqzMTPgECxAAk8uL+dwveTv6eH21tIHcltt8U3Ofajdo+D/ayO53LiYO +xi27kdHD0zvFMUWXLGxQtWyeqqDRvDagfWglHucIcaLxoxNwL8+e+9hVFIEskQAY +kVToBCKMXTQDLarz8/J030Pmcv3ihbwB+jhnykMuyyNmht4kq0CNgnlcMCdVz0d3 +z/09puryIHJrD+A8y3TD4RM74snQuwc9u5bsckvRtRJKbP3GX5JaFZAqUyZNRJRJ +Tn2OQRBhCpxhlZ2afkAPFIq2aVnEt/Ie6tmeRCzsW3lOxEH2K7MQSfSu/kRz7ELf +Cz3NJHj7rMzC+76Rhsas60t9CjmvMuGONEpctijDWONLCuch3Pdj6XpC+MVxpgBy +2VUdkunb48YhXNW0jgFGM/BFRj+dMQOUbY8PjJjsmVV0joDruWATQG/M4C7O8iU0 +B7o6yVv4m8LDEN9CiR6r7H17m4xZseT3f+0QpMe7iQjz6XxTUFRQxXqzmNnloA1T +7VjwPqIIzkj/u0V8nICG/ktLzp1OsCFatWXh7LbU+hwYl6gsFH/mFDqVxJ3+DKQi +vyf1NatzEwl62foVjGUSpvh3ymtmtUQ4JUkNDsXiRBWczaiGSuzD9Qi0ONdkAX3b +ewqmN4TfE+XIpCPxxHXwGq9Rv1IFjOdCX0iG436GHyTLC1tTUIKF5xV4Y0+cXIOI +RgQQEQgABgUCTpdI7gAKCRDFr3dKWFELWqaPAKD1TtT5c3sZz92Fj97KYmqbNQZP ++ACfSC6+hfvlj4GxmUjp1aepoVTo3weJAhwEEAEIAAYFAk6XSQsACgkQTFprqxLS +p64F8Q//cCcutwrH50UoRFejg0EIZav6LUKejC6kpLeubbEtuaIH3r2zMblPGc4i ++eMQKo/PqyQrceRXeNNlqO6/exHozYi2meudxa6IudhwJIOn1MQykJbNMSC2sGUp +1W5M1N5EYgt4hy+qhlfnD66LR4G+9t5FscTJSy84SdiOuqgCOpQmPkVRm1HX5X1+ +dmnzMOCk5LHHQuiacV0qeGO7JcBCVEIDr+uhU1H2u5GPFNHm5u15n25tOxVivb94 +xg6NDjouECBH7cCVuW79YcExH/0X3/9G45rjdHlKPH1OIUJiiX47OTxdG3dAbB4Q +fnViRJhjehFscFvYWSqXo3pgWqUsEvv9qJac2ZEMSz9x2mj0ekWxuM6/hGWxJdB+ ++985rIelPmc7VRAXOjIxWknrXnPCZAMlPlDLu6+vZ5BhFX0Be3y38f7GNCxFkJzl +hWZ4Cj3WojMj+0DaC1eKTj3rJ7OJlt9S9xnO7OOPEUTGyzgNIDAyCiu8F4huLPaT +ape6RupxOMHZeoCVlqx3ouWctelB2oNXcxxiQ/8y+21aHfD4n/CiIFwDvIQjl7dg +mT3u5Lr6yxuosR3QJx1P6rP5ZrDTP9khT30t+HZCbvs5Pq+v/9m6XDmi+NlU7Zuh +Ehy97tL3uBDgoL4b/5BpFL5U9nruPlQzGq1P9jj40dxAaDAX/WKJAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlB5KywFCQPDFt8ACgkQf8x9RqzM +TPhuCQ//QAjRSAOCQ02qmUAikT+mTB6baOAakkYq6uHbEO7qPZkv4E/M+HPIJ4wd +nBNeSQjfvdNcZBA/x0hr5EMcBneKKPDj4hJ0panOIRQmNSTThQw9OU351gm3YQct +AMPRUu1fTJAL/AuZUQf9ESmhyVtWNlH/56HBfYjE4iVeaRkkNLJyX3vkWdJSMwC/ +LO3Lw/0M3R8itDsm74F8w4xOdSQ52nSRFRh7PunFtREl+QzQ3EA/WB4AIj3VohIG +kWDfPFCzV3cyZQiEnjAe9gG5pHsXHUWQsDFZ12t784JgkGyO5wT26pzTiuApWM3k +/9V+o3HJSgH5hn7wuTi3TelEFwP1fNzI5iUUtZdtxbFOfWMnZAypEhaLmXNkg4zD +kH44r0ss9fR0DAgUav1a25UnbOn4PgIEQy2fgHKHwRpCy20d6oCSlmgyWsR40EPP +YvtGq49A2aK6ibXmdvvFT+Ts8Z+q2SkFpoYFX20mR2nsF0fbt1lfH65P64dukxeR +GteWIeNakDD40bAAOH8+OaoTGVBJ2ACJfLVNM53PEoftavAwUYMrR910qvwYfd/4 +6rh46g1Frr9SFMKYE9uvIJIgDsQB3QBp71houU4H55M5GD8XURYs+bfiQpJG1p7e +B8e5jZx1SagNWc4XwL2FzQ9svrkbg1Y+359buUiP7T6QXX2zY++JAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlEqbZUFCQg2wEEACgkQf8x9RqzM +TPhFMQ//WxAfKMdpSIA9oIC/yPD/dJpY/+DyouOljpE6MucMy/ArBECjFTBwi/j9 +NYM4ynAk34IkhuNexc1i9/05f5RM6+riLCLgAOsADDbHD4miZzoSxiVr6GQ3YXMb +OGld9kV9Sy6mGNjcUov7iFcf5Hy5w3AjPfKuR9zXswyfzIU1YXObiiZT38l55pp/ +BSgvGVQsvbNjsff5CbEKXS7q3xW+WzN0QWF6YsfNVhFjRGj8hKtHvwKcA02wwjLe +LXVTm6915ZUKhZXUFc0vM4Pj4EgNswH8Ojw9AJaKWJIZmLyW+aP+wpu6YwVCicxB +Y59CzBO2pPJDfKFQzUtrErk9irXeuCCLesDyirxJhv8o0JAvmnMAKOLhNFUrSQ2m ++3EnF7zhfz70gHW+EG8X8mL/EN3/dUM09j6TVrjtw43RLxBzwMDeariFF9yC+5bL +tnGgxjsB9Ik6GV5v34/NEEGf1qBiAzFmDVFRZlrNDkq6gmpvGnA5hUWNr+y0i01L +jGyaLSWHYjgw2UEQOqcUtTFK9MNzbZze4mVaHMEz9/aMfX25R6qbiNqCChveIm8m +Yr5Ds2zdZx+G5bAKdzX7nx2IUAxFQJEE94VLSp3npAaTWv3sHr7dR8tSyUJ9poDw +gw4W9BIcnAM7zvFYbLF5FNggg/26njHCCN70sHt8zGxKQINMc6SJAj0EEwEIACcC +GwMFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlLpFRkFCQ6EJy0ACgkQf8x9RqzM +TPjOZA//Zp0e25pcvle7cLc0YuFr9pBv2JIkLzPm83nkcwKmxaWayUIG4Sv6pH6h +m8+S/CHQij/yFCX+o3ngMw2J9HBUvafZ4bnbI0RGJ70GsAwraQ0VlkIfg7GUw3Tz +voGYO42rZTru9S0K/6nFP6D1HUu+U+AsJONLeb6oypQgInfXQExPZyliUnHdipei +4WR1YFW6sjSkZT/5C3J1wkAvPl5lvOVthI9Zs6bZlJLZwusKxU0UM4Btgu1Sf3nn +JcHmzisixwS9PMHE+AgPWIGSec/N27a0KmTTvImV6K6nEjXJey0K2+EYJuIBsYUN +orOGBwDFIhfRk9qGlpgt0KRyguV+AP5qvgry95IrYtrOuE7307SidEbSnvO5ezNe +mE7gT9Z1tM7IMPfmoKph4BfpNoH7aXiQh1Wo+ChdP92hZUtQrY2Nm13cmkxYjQ4Z +gMWfYMC+DA/GooSgZM5i6hYqyyfAuUD9kwRN6BqTbuAUAp+hCWYeN4D88sLYpFh3 +paDYNKJ+Gf7Yyi6gThcV956RUFDH3ys5Dk0vDL9NiWwdebWfRFbzoRM3dyGP889a +OyLzS3mh6nHzZrNGhW73kslSQek8tjKrB+56hXOnb4HaElTZGDvD5wmrrhN94kby +Gtz3cydIohvNO9d90+29h0eGEDYti7j7maHkBKUAwlcPvMg5m3Y= +=DA1T +-----END PGP PUBLIC KEY BLOCK----- From adc670c1c0aaf1a0e9116ecd1493332b8c9f9abe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 07:51:47 +0000 Subject: [PATCH 420/871] chore(deps): bump express Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-nodejs/tests/nodejs-express/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json b/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json index aa8f47a5c..19dd29fa4 100644 --- a/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json +++ b/buildpacks/buildpack-nodejs/tests/nodejs-express/package.json @@ -5,6 +5,6 @@ "node": "8.11.2" }, "dependencies": { - "express": "4.18.x" + "express": "4.19.x" } } From 4b524041937b1c6800b76d794b81ff96b773e408 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 07:51:54 +0000 Subject: [PATCH 421/871] chore(deps): bump express in /buildpacks/buildpack-multi/tests/multi Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.18.3...4.19.2) --- updated-dependencies: - dependency-name: express dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/package.json b/buildpacks/buildpack-multi/tests/multi/package.json index aa8f47a5c..19dd29fa4 100644 --- a/buildpacks/buildpack-multi/tests/multi/package.json +++ b/buildpacks/buildpack-multi/tests/multi/package.json @@ -5,6 +5,6 @@ "node": "8.11.2" }, "dependencies": { - "express": "4.18.x" + "express": "4.19.x" } } From 38bb1825555f35f432d33b66de7e310be27ab1d5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 08:49:18 +0000 Subject: [PATCH 422/871] chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin Bumps [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.12.1 to 3.13.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.12.1...maven-compiler-plugin-3.13.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index c80e19871..f6f6c8147 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -34,7 +34,7 @@ maven-compiler-plugin - 3.12.1 + 3.13.0 1.6 1.6 From 1b26eeff7f2fa367d78b1c191bff6b307412e178 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 08:49:35 +0000 Subject: [PATCH 423/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.9.1 to 3.0.10. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.0.9.1...v3.0.10) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 90e061b53..d50e4fb9b 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.9.1) + rack (3.0.10) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 4f965ee87a5553d6d40e3fe7178fd59184ca434a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 26 Mar 2024 08:50:17 +0000 Subject: [PATCH 424/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 2.2.8.1 to 2.2.9. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v2.2.8.1...v2.2.9) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index e8cfe5121..16af5eab9 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (2.2.8.1) + rack (2.2.9) rack-protection (3.2.0) base64 (>= 0.1.0) rack (~> 2.2, >= 2.2.4) From 3f0470aeeb201a926d654cb41c39cb32d94583a5 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 26 Mar 2024 21:05:31 +0000 Subject: [PATCH 425/871] Update nodejs to version v239 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index e3b78e361..29b3cfb96 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v238 +v239 From b538ee48af67c22cffd332df649e5d605e209801 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 26 Mar 2024 21:05:39 +0000 Subject: [PATCH 426/871] Update python to version v246 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 6b1dadddb..425584232 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v243 +v246 From 1f6bb7136b57f0b38ddad8a952509bf581b7ac31 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 28 Mar 2024 05:29:21 +0000 Subject: [PATCH 427/871] Update nodejs to version v240 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 29b3cfb96..8c9e1ccb4 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v239 +v240 From 542cc513e82d8ee5a759e556ba045e4584d3bbf7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 28 Mar 2024 05:35:30 +0000 Subject: [PATCH 428/871] chore(deps): bump actions/download-artifact from 3 to 4 Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4. - [Release notes](https://github.com/actions/download-artifact/releases) - [Commits](https://github.com/actions/download-artifact/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/download-artifact dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/main.yml | 2 +- .github/workflows/tag-release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f60747b8e..c08d9085b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -125,7 +125,7 @@ jobs: go-version: 1.17.8 - name: download packages - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-${{ matrix.heroku }}-false path: build diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 5c8455449..9f04ed009 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -68,7 +68,7 @@ jobs: ruby-version: 3.3 - name: download packages - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: build-22-false path: build From 7e222832d961f48485235fff104159cadc2cd6a9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 02:47:04 -0400 Subject: [PATCH 429/871] chore(deps): bump actions/upload-artifact from 3 to 4 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c08d9085b..e34a9bdb6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -87,7 +87,7 @@ jobs: fi - name: upload packages - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-${{ matrix.heroku }}-${{ matrix.buildx }} path: build From 37449a4d01e12ac6581ef6318e5f454270de3f15 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 02:47:19 -0400 Subject: [PATCH 430/871] chore(deps): bump actions/upload-artifact from 3 to 4 --- .github/workflows/tag-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index 9f04ed009..d3f073712 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -50,7 +50,7 @@ jobs: make build build/docker/${{ matrix.heroku }} BUILDX=false STACK_VERSION=${{ matrix.heroku }} - name: upload packages - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: build-${{ matrix.heroku }}-${{ matrix.buildx }} path: build From f5fca812ded5ff2572dc03737c0ffffbc9c721cb Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 02:53:38 -0400 Subject: [PATCH 431/871] Release 0.7.5 - #1148 @dokku-bot: Update go to version v189 - #1149 @dokku-bot: Update nodejs to version v238 - #1152 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 in /buildpacks/buildpack-java/tests/java-jetty - #1153 @dependabot: chore(deps): bump rack from 2.2.8.1 to 2.2.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1154 @dependabot: chore(deps): bump rack from 3.0.9.1 to 3.0.10 in /buildpacks/buildpack-multi/tests/multi - #1159 @josegonzalez: chore: update ruby in ci to latest version to fix releases - #1160 @josegonzalez: Vendor build directory to fix builds - #1161 @dependabot: chore(deps): bump express from 4.18.3 to 4.19.2 in /buildpacks/buildpack-nodejs/tests/nodejs-express - #1162 @dependabot: chore(deps): bump express from 4.18.3 to 4.19.2 in /buildpacks/buildpack-multi/tests/multi - #1167 @dokku-bot: Update nodejs to version v239 - #1168 @dokku-bot: Update python to version v246 - #1169 @dokku-bot: Update nodejs to version v240 --- CHANGELOG.md | 17 ++++++++++++++++- Makefile | 2 +- README.md | 4 ++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a1efef20..742a96c76 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,22 @@ All notable changes to this project will be documented in this file. -## [0.7.4](https://github.com/gliderlabs/herokuish/compare/v0.7.3...v0.7.4) - 2024-04-4 +## [0.7.5](https://github.com/gliderlabs/herokuish/compare/v0.7.4...v0.7.5) - 2024-03-28 + +- #1148 @dokku-bot: Update go to version v189 +- #1149 @dokku-bot: Update nodejs to version v238 +- #1152 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-compiler-plugin from 3.12.1 to 3.13.0 in /buildpacks/buildpack-java/tests/java-jetty +- #1153 @dependabot: chore(deps): bump rack from 2.2.8.1 to 2.2.9 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1154 @dependabot: chore(deps): bump rack from 3.0.9.1 to 3.0.10 in /buildpacks/buildpack-multi/tests/multi +- #1159 @josegonzalez: chore: update ruby in ci to latest version to fix releases +- #1160 @josegonzalez: Vendor build directory to fix builds +- #1161 @dependabot: chore(deps): bump express from 4.18.3 to 4.19.2 in /buildpacks/buildpack-nodejs/tests/nodejs-express +- #1162 @dependabot: chore(deps): bump express from 4.18.3 to 4.19.2 in /buildpacks/buildpack-multi/tests/multi +- #1167 @dokku-bot: Update nodejs to version v239 +- #1168 @dokku-bot: Update python to version v246 +- #1169 @dokku-bot: Update nodejs to version v240 + +## [0.7.4](https://github.com/gliderlabs/herokuish/compare/v0.7.3...v0.7.4) - 2024-03-04 - #1120 @dependabot: chore(deps): bump rack from 3.0.8 to 3.0.9 in /buildpacks/buildpack-multi/tests/multi - #1121 @dependabot: chore(deps): bump markupsafe from 2.1.4 to 2.1.5 in /buildpacks/buildpack-python/tests/python-flask diff --git a/Makefile b/Makefile index f83370dbf..1b54618cb 100644 --- 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.7.4 +VERSION ?= 0.7.5 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index b9ceb7bb1..28e3cfccb 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.7.4-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.5-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.7.4/herokuish_0.7.4_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.5/herokuish_0.7.5_linux_x86_64.tgz \ | tar -xzC /bin ``` From 821af7da22d629b0ce21289a700cdd5a47710df4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 05:19:37 -0400 Subject: [PATCH 432/871] fix: use a run mount to add build dependencies Because of how herokuish is used, adding the files directly breaks shortcut usage of the herokuish binary as /build. --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4857388ab..135430aca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,8 +16,7 @@ ARG TARGETARCH ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh /tmp/setup-02.sh ADD bin/setup.sh /tmp/setup.sh -ADD build-deps/${STACK_VERSION} /build -RUN STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ +RUN --mount=source=build-deps/${STACK_VERSION},target=/build STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ rm -rf /tmp/setup.sh ENV STACK=heroku-$STACK_VERSION From fa8ac35823385068d6a971736a3d8a39b841e1f6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 05:37:59 -0400 Subject: [PATCH 433/871] Release 0.7.6 - #1171 @josegonzalez: Use a run mount to add build dependencies --- CHANGELOG.md | 4 ++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 742a96c76..c73f453e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ All notable changes to this project will be documented in this file. +## [0.7.6](https://github.com/gliderlabs/herokuish/compare/v0.7.5...v0.7.6) - 2024-03-28 + +- #1171 @josegonzalez: Use a run mount to add build dependencies + ## [0.7.5](https://github.com/gliderlabs/herokuish/compare/v0.7.4...v0.7.5) - 2024-03-28 - #1148 @dokku-bot: Update go to version v189 diff --git a/Makefile b/Makefile index 1b54618cb..ebde00d18 100644 --- 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.7.5 +VERSION ?= 0.7.6 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 28e3cfccb..1c607235d 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.7.5-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.7.6-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.7.5/herokuish_0.7.5_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.7.6/herokuish_0.7.6_linux_x86_64.tgz \ | tar -xzC /bin ``` From ff89948f1c1b11a427ca391632200e5d93d0b7b9 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 06:43:50 -0400 Subject: [PATCH 434/871] Use find to identify only files not already owned by user --- include/buildpack.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index f53ddf1a4..47889eeef 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -161,7 +161,7 @@ buildpack-setup() { # Prepare permissions quicker for slower filesystems # vars defined in outer scope # shellcheck disable=SC2154 - chown -R "$unprivileged_user:$unprivileged_group" "$app_path" + find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" # shellcheck disable=SC2154 find "$build_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" # shellcheck disable=SC2154 From f6c84700aa12fc76681936d2e60a55406dc229d1 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 06:45:08 -0400 Subject: [PATCH 435/871] chore: sync chown commands --- include/buildpack.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index 47889eeef..dd3cbb164 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -161,7 +161,7 @@ buildpack-setup() { # Prepare permissions quicker for slower filesystems # vars defined in outer scope # shellcheck disable=SC2154 - find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" + find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" # shellcheck disable=SC2154 find "$build_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" # shellcheck disable=SC2154 From 11315542c640f98b1e30ca355c780dab75a6313e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 08:57:13 -0400 Subject: [PATCH 436/871] chore: run shfmt This is run using the same shfmt settings we have in dokku: 'shfmt -l -bn -ci -i 2 -w .' Additionally, ensure linters are added to github actions for testing in CI. --- .github/linters/.hadolint.yml | 6 + .github/linters/.markdown-lint.yml | 37 +++ .github/linters/.yamllint.yml | 8 + .github/workflows/lint.yml | 77 ++++++ Dockerfile | 8 +- buildpacks/test | 31 ++- contrib/post-install | 4 +- include/buildpack.bash | 408 +++++++++++++++-------------- include/cmd.bash | 113 ++++---- include/default_user.bash | 4 +- include/fn.bash | 34 +-- include/herokuish.bash | 224 ++++++++-------- include/procfile.bash | 200 +++++++------- include/slug.bash | 87 +++--- tests/functional/tests.sh | 51 ++-- tests/unit/tests.sh | 327 ++++++++++++----------- 16 files changed, 873 insertions(+), 746 deletions(-) create mode 100644 .github/linters/.hadolint.yml create mode 100644 .github/linters/.markdown-lint.yml create mode 100644 .github/linters/.yamllint.yml create mode 100644 .github/workflows/lint.yml diff --git a/.github/linters/.hadolint.yml b/.github/linters/.hadolint.yml new file mode 100644 index 000000000..1a5ae337a --- /dev/null +++ b/.github/linters/.hadolint.yml @@ -0,0 +1,6 @@ +ignored: + - DL3048 + - DL3005 + - DL3008 + - DL3003 + - SC2035 diff --git a/.github/linters/.markdown-lint.yml b/.github/linters/.markdown-lint.yml new file mode 100644 index 000000000..e16596c0a --- /dev/null +++ b/.github/linters/.markdown-lint.yml @@ -0,0 +1,37 @@ +--- +default: true + +# Line length +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md013 +MD013: false + +# Inline HTML +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md033 +MD033: false + +# List indentation +# 2 spaces breaks list formatting in mkdocs +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md007 +MD007: + indent: 4 + +# Fenced code blocks should have a language specified +# We use a second, un-languaged code block to denote the output +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md040 +MD040: false + +# Blank line inside blockquote +# This is typically done when a section has a "New as of" or "Warning" in addition to a note +# May wish to take advantage of github-style admonitions +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md028 +MD028: false + +# No duplicate headers +# HISTORY.md has a ton of these +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md024 +MD024: false + +# First line h1 +# The issue template doesn't have one +# https://github.com/DavidAnson/markdownlint/blob/main/doc/Rules.md#md041 +MD041: false diff --git a/.github/linters/.yamllint.yml b/.github/linters/.yamllint.yml new file mode 100644 index 000000000..fe6352dcc --- /dev/null +++ b/.github/linters/.yamllint.yml @@ -0,0 +1,8 @@ +--- +extends: default + +rules: + line-length: disable + +ignore: + - plugins/scheduler-k3s/templates/* diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml new file mode 100644 index 000000000..be1b4a4b8 --- /dev/null +++ b/.github/workflows/lint.yml @@ -0,0 +1,77 @@ +--- +name: "lint" + +# yamllint disable-line rule:truthy +on: + pull_request: + branches: + - "*" + push: + branches: + - "master" + +concurrency: + group: lint-${{ github.event.pull_request.number || github.ref }} + cancel-in-progress: true + +jobs: + hadolint: + name: hadolint + runs-on: ubuntu-22.04 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Run hadolint + uses: hadolint/hadolint-action@54c9adbab1582c2ef04b2016b760714a4bfde3cf + with: + config: .github/linters/.hadolint.yml + + markdown-lint: + name: markdown-lint + runs-on: ubuntu-22.04 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Setup node + uses: actions/setup-node@v4 + with: + node-version: "20" + cache: "npm" + cache-dependency-path: ".github/workflows/lint.yml" + - name: Install markdownlint-cli + run: npm install -g markdownlint-cli@0.35.0 + - name: Run markdown-lint + run: markdownlint -c .github/linters/.markdown-lint.yml *.md **/*.md + + shellcheck: + name: shellcheck + runs-on: ubuntu-22.04 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Run shellcheck + uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 + + shfmt: + name: shfmt + runs-on: ubuntu-22.04 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Run shfmt + uses: luizm/action-sh-checker@c6edb3de93e904488b413636d96c6a56e3ad671a + env: + SHFMT_OPTS: -l -bn -ci -i 2 -d + with: + sh_checker_shellcheck_disable: true + + yamllint: + name: yamllint + runs-on: ubuntu-22.04 + steps: + - name: Clone + uses: actions/checkout@v4 + - name: Run yamllint + uses: ibiqlik/action-yamllint@2576378a8e339169678f9939646ee3ee325e845c + with: + config_file: ".github/linters/.yamllint.yml" diff --git a/Dockerfile b/Dockerfile index 135430aca..3d161ec55 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ ARG STACK_VERSION=20 FROM golang:1.22 AS builder RUN mkdir /src -ADD . /src/ +COPY . /src/ WORKDIR /src ARG VERSION @@ -15,7 +15,7 @@ ARG TARGETARCH ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}/setup.sh /tmp/setup-01.sh ADD https://raw.githubusercontent.com/heroku/stack-images/main/heroku-${STACK_VERSION}-build/setup.sh /tmp/setup-02.sh -ADD bin/setup.sh /tmp/setup.sh +COPY bin/setup.sh /tmp/setup.sh RUN --mount=source=build-deps/${STACK_VERSION},target=/build STACK_VERSION=${STACK_VERSION} TARGETARCH=${TARGETARCH} /tmp/setup.sh && \ rm -rf /tmp/setup.sh @@ -24,9 +24,9 @@ ENV DEBIAN_FRONTEND noninteractive LABEL com.gliderlabs.herokuish/stack=$STACK RUN apt-get update -qq \ - && apt-get install -qq -y daemontools \ + && apt-get install --no-install-recommends -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 -y -o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew \ --allow-downgrades \ --allow-remove-essential \ --allow-change-held-packages \ diff --git a/buildpacks/test b/buildpacks/test index e135e3268..b928c48d0 100755 --- a/buildpacks/test +++ b/buildpacks/test @@ -8,14 +8,13 @@ _run-cmd() { local buildpack="buildpack-${1%%-*}" cd "$(dirname "${BASH_SOURCE[0]}")" || return 1 local app_path="$PWD/$buildpack/tests/$app" - cd - &> /dev/null || return 1 - [[ "$CI" ]] || rmflag="--rm" + cd - &>/dev/null || return 1 + [[ "$CI" ]] || rmflag="--rm" [[ "$TRACE" ]] && debug_flag="-e TRACE=true" # shellcheck disable=SC2086 docker run $rmflag $debug_flag --env=USER=herokuishuser -v "$app_path:/tmp/app" herokuish:dev /bin/herokuish $cmd / "$app" } - # called by test.sh stub in app tests app-test() { declare app="$1" @@ -40,19 +39,19 @@ buildpack-test() { main() { case "$#" in - 0) # no args, run all the tests! - cd "$(dirname "${BASH_SOURCE[0]}")" || return 1 - basht "$PWD/buildpack*/tests/*/test.sh" - ;; - - 1) # one arg, expect name of buildpack to test - cd "$(dirname "${BASH_SOURCE[0]}")" || return 1 - basht "$PWD/$1/tests/*/test.sh" - ;; - - *) # more args, pass directly to basht - basht "$@" - ;; + 0) # no args, run all the tests! + cd "$(dirname "${BASH_SOURCE[0]}")" || return 1 + basht "$PWD/buildpack*/tests/*/test.sh" + ;; + + 1) # one arg, expect name of buildpack to test + cd "$(dirname "${BASH_SOURCE[0]}")" || return 1 + basht "$PWD/$1/tests/*/test.sh" + ;; + + *) # more args, pass directly to basht + basht "$@" + ;; esac } diff --git a/contrib/post-install b/contrib/post-install index 6a3fb6eae..0c9c0c4a6 100644 --- a/contrib/post-install +++ b/contrib/post-install @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if which systemctl > /dev/null; then +if which systemctl >/dev/null; then echo "Starting docker" systemctl start docker sleep 5 @@ -14,7 +14,7 @@ docker images -a | grep "^gliderlabs\/herokuish" | grep -v latest | awk '{print echo 'Importing herokuish into docker (around 5 minutes)' if [[ -n "$http_proxy" ]] || [[ -n "$https_proxy" ]]; then - echo "See the docker pull docs for proxy configuration"; + echo "See the docker pull docs for proxy configuration" fi VERSION=$(cat /var/lib/herokuish/VERSION) diff --git a/include/buildpack.bash b/include/buildpack.bash index dd3cbb164..93f0cb70e 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -1,229 +1,231 @@ - _envfile-parse() { - declare desc="Parse input into shell export commands" - local key - local value - while read -r line || [[ -n "$line" ]]; do - [[ "$line" =~ ^#.* ]] && continue - [[ "$line" =~ ^$ ]] && continue - key=${line%%=*} - key=${key#*export } - value="${line#*=}" - case "$value" in - \'*|\"*) - value="${value}" - ;; - *) - value=\""${value}"\" - ;; - esac - echo "export ${key}=${value}" - done <<< "$(cat)" + declare desc="Parse input into shell export commands" + local key + local value + while read -r line || [[ -n "$line" ]]; do + [[ "$line" =~ ^#.* ]] && continue + [[ "$line" =~ ^$ ]] && continue + key=${line%%=*} + key=${key#*export } + value="${line#*=}" + case "$value" in + \'* | \"*) + value="${value}" + ;; + *) + value=\""${value}"\" + ;; + esac + echo "export ${key}=${value}" + done <<<"$(cat)" } _move-build-to-app() { - shopt -s dotglob nullglob - # shellcheck disable=SC2086 - rm -rf ${app_path:?}/* - # build_path defined in outer scope - # shellcheck disable=SC2086,SC2154 - mv $build_path/* $app_path - shopt -u dotglob nullglob + shopt -s dotglob nullglob + # shellcheck disable=SC2086 + rm -rf ${app_path:?}/* + # build_path defined in outer scope + # shellcheck disable=SC2086,SC2154 + mv $build_path/* $app_path + shopt -u dotglob nullglob } _select-buildpack() { - if [[ -n "$BUILDPACK_URL" ]]; then - title "Fetching custom buildpack" - # buildpack_path defined in outer scope - # shellcheck disable=SC2154 - selected_path="$buildpack_path/custom" - rm -rf "$selected_path" - - IFS='#' read -r url commit <<< "$BUILDPACK_URL" - buildpack-install "$url" "$commit" custom &> /dev/null - # unprivileged_user & unprivileged_group defined in outer scope - # shellcheck disable=SC2154 - chown -R "$unprivileged_user:$unprivileged_group" "$buildpack_path/custom" - selected_name="$(unprivileged "$selected_path/bin/detect" "$build_path" || true)" - else - local buildpacks=($buildpack_path/*) - local valid_buildpacks=() - for buildpack in "${buildpacks[@]}"; do - unprivileged "$buildpack/bin/detect" "$build_path" &> /dev/null \ - && valid_buildpacks+=("$buildpack") - done - if [[ ${#valid_buildpacks[@]} -gt 1 ]]; then - title "Warning: Multiple default buildpacks reported the ability to handle this app. The first buildpack in the list below will be used." - echo "Detected buildpacks: $(sed -e "s:/tmp/buildpacks/[0-9][0-9]_buildpack-::g" <<< "${valid_buildpacks[@]}")" | indent - fi - if [[ ${#valid_buildpacks[@]} -gt 0 ]]; then - selected_path="${valid_buildpacks[0]}" - selected_name=$(unprivileged "$selected_path/bin/detect" "$build_path") - fi - fi - if [[ "$selected_path" ]] && [[ "$selected_name" ]]; then - title "$selected_name app detected" - else - title "Unable to select a buildpack" - exit 1 - fi + if [[ -n "$BUILDPACK_URL" ]]; then + title "Fetching custom buildpack" + # buildpack_path defined in outer scope + # shellcheck disable=SC2154 + selected_path="$buildpack_path/custom" + rm -rf "$selected_path" + + IFS='#' read -r url commit <<<"$BUILDPACK_URL" + buildpack-install "$url" "$commit" custom &>/dev/null + # unprivileged_user & unprivileged_group defined in outer scope + # shellcheck disable=SC2154 + chown -R "$unprivileged_user:$unprivileged_group" "$buildpack_path/custom" + selected_name="$(unprivileged "$selected_path/bin/detect" "$build_path" || true)" + else + local buildpacks=($buildpack_path/*) + local valid_buildpacks=() + for buildpack in "${buildpacks[@]}"; do + unprivileged "$buildpack/bin/detect" "$build_path" &>/dev/null \ + && valid_buildpacks+=("$buildpack") + done + if [[ ${#valid_buildpacks[@]} -gt 1 ]]; then + title "Warning: Multiple default buildpacks reported the ability to handle this app. The first buildpack in the list below will be used." + echo "Detected buildpacks: $(sed -e "s:/tmp/buildpacks/[0-9][0-9]_buildpack-::g" <<<"${valid_buildpacks[@]}")" | indent + fi + if [[ ${#valid_buildpacks[@]} -gt 0 ]]; then + selected_path="${valid_buildpacks[0]}" + selected_name=$(unprivileged "$selected_path/bin/detect" "$build_path") + fi + fi + if [[ "$selected_path" ]] && [[ "$selected_name" ]]; then + title "$selected_name app detected" + else + title "Unable to select a buildpack" + exit 1 + fi } buildpack-build() { - declare desc="Build an application using installed buildpacks" - ensure-paths - [[ "$USER" ]] || randomize-unprivileged - buildpack-setup > /dev/null - buildpack-execute | indent - procfile-types | indent + declare desc="Build an application using installed buildpacks" + ensure-paths + [[ "$USER" ]] || randomize-unprivileged + buildpack-setup >/dev/null + buildpack-execute | indent + procfile-types | indent } buildpack-install() { - declare desc="Install buildpack from Git URL and optional committish" - declare url="$1" commit="$2" name="$3" - ensure-paths - if [[ ! "$url" ]]; then - asset-cat include/buildpacks.txt | while read -r name url commit; do - buildpack-install "$url" "$commit" "$name" - done - return - fi - # buildpack_path is defined in outer scope - # shellcheck disable=SC2154 - local target_path="$buildpack_path/${name:-$(basename "$url")}" - if [[ "$(git ls-remote "$url" &> /dev/null; echo $?)" -eq 0 ]]; then - if [[ "$commit" ]]; then - if ! git clone --branch "$commit" --quiet --depth 1 "$url" "$target_path" &>/dev/null; then - # if the shallow clone failed partway through, clean up and try a full clone - rm -rf "$target_path" - git clone "$url" "$target_path" - cd "$target_path" || return 1 - git checkout --quiet "$commit" - cd - > /dev/null || return 1 - else - echo "Cloning into '$target_path'..." - fi - else - git clone --depth=1 "$url" "$target_path" - fi - else - local tar_args - case "$url" in - *.tgz|*.tar.gz) - target_path="${target_path//.tgz}" - target_path="${target_path//.tar.gz}" - tar_args="-xzC" - ;; - *.tbz|*.tar.bz) - target_path="${target_path//.tbz}" - target_path="${target_path//.tar.bz}" - tar_args="-xjC" - ;; - *.tar) - target_path="${target_path//.tar}" - tar_args="-xC" - ;; - esac - echo "Downloading '$url' into '$target_path'..." - mkdir -p "$target_path" - curl -s --retry 2 "$url" | tar "$tar_args" "$target_path" - chown -R root:root "$target_path" - chmod 755 "$target_path" - fi - - find "$buildpack_path" \( \! -user "${unprivileged_user:-32767}" -o \! -group "${unprivileged_group:-32767}" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "${unprivileged_user:-32767}:${unprivileged_group:-32767}" + declare desc="Install buildpack from Git URL and optional committish" + declare url="$1" commit="$2" name="$3" + ensure-paths + if [[ ! "$url" ]]; then + asset-cat include/buildpacks.txt | while read -r name url commit; do + buildpack-install "$url" "$commit" "$name" + done + return + fi + # buildpack_path is defined in outer scope + # shellcheck disable=SC2154 + local target_path="$buildpack_path/${name:-$(basename "$url")}" + if [[ "$( + git ls-remote "$url" &>/dev/null + echo $? + )" -eq 0 ]]; then + if [[ "$commit" ]]; then + if ! git clone --branch "$commit" --quiet --depth 1 "$url" "$target_path" &>/dev/null; then + # if the shallow clone failed partway through, clean up and try a full clone + rm -rf "$target_path" + git clone "$url" "$target_path" + cd "$target_path" || return 1 + git checkout --quiet "$commit" + cd - >/dev/null || return 1 + else + echo "Cloning into '$target_path'..." + fi + else + git clone --depth=1 "$url" "$target_path" + fi + else + local tar_args + case "$url" in + *.tgz | *.tar.gz) + target_path="${target_path//.tgz/}" + target_path="${target_path//.tar.gz/}" + tar_args="-xzC" + ;; + *.tbz | *.tar.bz) + target_path="${target_path//.tbz/}" + target_path="${target_path//.tar.bz/}" + tar_args="-xjC" + ;; + *.tar) + target_path="${target_path//.tar/}" + tar_args="-xC" + ;; + esac + echo "Downloading '$url' into '$target_path'..." + mkdir -p "$target_path" + curl -s --retry 2 "$url" | tar "$tar_args" "$target_path" + chown -R root:root "$target_path" + chmod 755 "$target_path" + fi + + find "$buildpack_path" \( \! -user "${unprivileged_user:-32767}" -o \! -group "${unprivileged_group:-32767}" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "${unprivileged_user:-32767}:${unprivileged_group:-32767}" } buildpack-list() { - declare desc="List installed buildpacks" - ensure-paths - ls -1 "$buildpack_path" + declare desc="List installed buildpacks" + ensure-paths + ls -1 "$buildpack_path" } buildpack-setup() { - # Buildpack expectations - # app_path defined in outer scope - # shellcheck disable=SC2154 - export APP_DIR="$app_path" - # shellcheck disable=SC2154 - export HOME="$app_path" - export REQUEST_ID="build-$RANDOM" - export STACK="${STACK:-heroku-20}" - # build_path defined in outer scope - # shellcheck disable=SC2154 - cp -r "$app_path/." "$build_path" - - # Prepare dropped privileges - # unprivileged_user defined in outer scope - # shellcheck disable=SC2154 - usermod --home "$HOME" "$unprivileged_user" > /dev/null 2>&1 - - # Prepare permissions quicker for slower filesystems - # vars defined in outer scope - # shellcheck disable=SC2154 - find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" - # shellcheck disable=SC2154 - find "$build_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" - # shellcheck disable=SC2154 - find "$cache_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" - # shellcheck disable=SC2154 - find "$env_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" - # shellcheck disable=SC2154 - find "$buildpack_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" - - # Useful settings / features - export CURL_CONNECT_TIMEOUT="30" - export CURL_TIMEOUT="180" - - # Buildstep backwards compatibility - if [[ -f "$app_path/.env" ]]; then - # shellcheck disable=SC2046 - eval $(cat "$app_path/.env" | _envfile-parse) - fi + # Buildpack expectations + # app_path defined in outer scope + # shellcheck disable=SC2154 + export APP_DIR="$app_path" + # shellcheck disable=SC2154 + export HOME="$app_path" + export REQUEST_ID="build-$RANDOM" + export STACK="${STACK:-heroku-20}" + # build_path defined in outer scope + # shellcheck disable=SC2154 + cp -r "$app_path/." "$build_path" + + # Prepare dropped privileges + # unprivileged_user defined in outer scope + # shellcheck disable=SC2154 + usermod --home "$HOME" "$unprivileged_user" >/dev/null 2>&1 + + # Prepare permissions quicker for slower filesystems + # vars defined in outer scope + # shellcheck disable=SC2154 + find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" + # shellcheck disable=SC2154 + find "$build_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" + # shellcheck disable=SC2154 + find "$cache_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" + # shellcheck disable=SC2154 + find "$env_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" + # shellcheck disable=SC2154 + find "$buildpack_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -P 0 -0 --no-run-if-empty chown --no-dereference "$unprivileged_user:$unprivileged_group" + + # Useful settings / features + export CURL_CONNECT_TIMEOUT="30" + export CURL_TIMEOUT="180" + + # Buildstep backwards compatibility + if [[ -f "$app_path/.env" ]]; then + # shellcheck disable=SC2046 + eval $(cat "$app_path/.env" | _envfile-parse) + fi } buildpack-execute() { - _select-buildpack - cd "$build_path" || return 1 - unprivileged "$selected_path/bin/compile" "$build_path" "$cache_path" "$env_path" - if [[ -f "$selected_path/bin/release" ]]; then - unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" > "$build_path/.release" - fi - if [[ -f "$build_path/.release" ]]; then - config_vars="$(cat "$build_path/.release" | yaml-get config_vars)" - if [[ "$config_vars" ]]; then - mkdir -p "$build_path/.profile.d" - OIFS=$IFS - IFS=$'\n' - for var in $config_vars; do - echo "export $(echo "$var" | sed -e 's/=/="/' -e 's/$/"/')" >> "$build_path/.profile.d/00_config_vars.sh" - done - IFS=$OIFS - fi - fi - cd - > /dev/null || return 1 - _move-build-to-app + _select-buildpack + cd "$build_path" || return 1 + unprivileged "$selected_path/bin/compile" "$build_path" "$cache_path" "$env_path" + if [[ -f "$selected_path/bin/release" ]]; then + unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" >"$build_path/.release" + fi + if [[ -f "$build_path/.release" ]]; then + config_vars="$(cat "$build_path/.release" | yaml-get config_vars)" + if [[ "$config_vars" ]]; then + mkdir -p "$build_path/.profile.d" + OIFS=$IFS + IFS=$'\n' + for var in $config_vars; do + echo "export $(echo "$var" | sed -e 's/=/="/' -e 's/$/"/')" >>"$build_path/.profile.d/00_config_vars.sh" + done + IFS=$OIFS + fi + fi + cd - >/dev/null || return 1 + _move-build-to-app } buildpack-test() { - declare desc="Build and run tests for an application using installed buildpacks" - ensure-paths - [[ "$USER" ]] || randomize-unprivileged - buildpack-setup > /dev/null - _select-buildpack - - if [[ ! -f "$selected_path/bin/test-compile" ]] || [[ ! -f "$selected_path/bin/test" ]]; then - echo "Selected buildpack does not support test feature" - exit 1 - fi - - cd "$build_path" || return 1 - chmod 755 "$selected_path/bin/test-compile" - unprivileged "$selected_path/bin/test-compile" "$build_path" "$cache_path" "$env_path" - - cd "$app_path" || return 1 - _move-build-to-app - procfile-load-profile - chmod 755 "$selected_path/bin/test" - unprivileged "$selected_path/bin/test" "$app_path" "$env_path" + declare desc="Build and run tests for an application using installed buildpacks" + ensure-paths + [[ "$USER" ]] || randomize-unprivileged + buildpack-setup >/dev/null + _select-buildpack + + if [[ ! -f "$selected_path/bin/test-compile" ]] || [[ ! -f "$selected_path/bin/test" ]]; then + echo "Selected buildpack does not support test feature" + exit 1 + fi + + cd "$build_path" || return 1 + chmod 755 "$selected_path/bin/test-compile" + unprivileged "$selected_path/bin/test-compile" "$build_path" "$cache_path" "$env_path" + + cd "$app_path" || return 1 + _move-build-to-app + procfile-load-profile + chmod 755 "$selected_path/bin/test" + unprivileged "$selected_path/bin/test" "$app_path" "$env_path" } diff --git a/include/cmd.bash b/include/cmd.bash index 8be6696b5..4439abe33 100644 --- a/include/cmd.bash +++ b/include/cmd.bash @@ -1,81 +1,84 @@ - declare -A CMDS cmd-list() { - declare desc="Lists available commands" - declare ns="$1" - cmd-list-keys "$ns" | sed "s/$ns://" + declare desc="Lists available commands" + declare ns="$1" + cmd-list-keys "$ns" | sed "s/$ns://" } cmd-list-keys() { - declare ns="$1" - for k in "${!CMDS[@]}"; do - echo "$k" - done | grep "^$ns:" | sort + declare ns="$1" + for k in "${!CMDS[@]}"; do + echo "$k" + done | grep "^$ns:" | sort } cmd-list-ns() { - for k in "${!CMDS[@]}"; do - echo "$k" - done | grep -v : | sort + for k in "${!CMDS[@]}"; do + echo "$k" + done | grep -v : | sort } cmd-export() { - declare desc="Exports a function as a command" - declare fn="$1" as="${2:-$1}" - local ns="" - for n in $(cmd-list-ns); do - echo "$fn" | grep "^$n-" &> /dev/null && ns="$n" - done - CMDS["$ns:${as/#$ns-/}"]="$fn" + declare desc="Exports a function as a command" + declare fn="$1" as="${2:-$1}" + local ns="" + for n in $(cmd-list-ns); do + echo "$fn" | grep "^$n-" &>/dev/null && ns="$n" + done + CMDS["$ns:${as/#$ns-/}"]="$fn" } cmd-export-ns() { - declare ns="$1" desc="$2" - eval "$1() { + declare ns="$1" desc="$2" + eval "$1() { declare desc=\"$desc\" cmd-ns $1 \"\$@\"; }" - cmd-export "$1" - CMDS["$1"]="$1" + cmd-export "$1" + CMDS["$1"]="$1" } cmd-ns() { - local ns="$1"; shift - local cmd="$1"; shift || true - local status=0 - if cmd-list "$ns" | grep ^"$cmd"\$ &> /dev/null; then - ${CMDS["$ns:$cmd"]} "$@" - else - if [[ "$cmd" ]]; then - echo "No such command: $cmd" - status=2 - elif [[ "$ns" ]]; then - fn-desc "$ns" - fi - echo - echo "Available commands:" - for cmd in $(cmd-list "$ns"); do - printf " %-24s %s\n" "$cmd" "$(fn-desc "${CMDS["$ns:$cmd"]}")" - for subcmd in $(cmd-list "$cmd"); do - printf " %-24s %s\n" "$subcmd" "$(fn-desc "${CMDS["$cmd:$subcmd"]}")" - done - done - echo - exit $status - fi + local ns="$1" + shift + local cmd="$1" + shift || true + local status=0 + if cmd-list "$ns" | grep ^"$cmd"\$ &>/dev/null; then + ${CMDS["$ns:$cmd"]} "$@" + else + if [[ "$cmd" ]]; then + echo "No such command: $cmd" + status=2 + elif [[ "$ns" ]]; then + fn-desc "$ns" + fi + echo + echo "Available commands:" + for cmd in $(cmd-list "$ns"); do + printf " %-24s %s\n" "$cmd" "$(fn-desc "${CMDS["$ns:$cmd"]}")" + for subcmd in $(cmd-list "$cmd"); do + printf " %-24s %s\n" "$subcmd" "$(fn-desc "${CMDS["$cmd:$subcmd"]}")" + done + done + echo + exit $status + fi } cmd-help() { - declare desc="Shows help information for a command" - declare args="$*" - if [[ "$args" ]]; then - for cmd; do true; done # last arg - local ns="${args/%$cmd/}"; ns="${ns/% /}"; ns="${ns/ /-}" - local fn="${CMDS["$ns:$cmd"]}" - fn-info "$fn" 1 - else - cmd-ns "" - fi + declare desc="Shows help information for a command" + declare args="$*" + if [[ "$args" ]]; then + for cmd; do true; done # last arg + local ns="${args/%$cmd/}" + ns="${ns/% /}" + ns="${ns/ /-}" + local fn="${CMDS["$ns:$cmd"]}" + fn-info "$fn" 1 + else + cmd-ns "" + fi } cmd-export cmd-help help diff --git a/include/default_user.bash b/include/default_user.bash index 6f7b7ae3f..0d4acf268 100644 --- a/include/default_user.bash +++ b/include/default_user.bash @@ -1,7 +1,7 @@ #!/usr/bin/env bash -addgroup --quiet --gid "32767" "herokuishuser" && \ -adduser \ +addgroup --quiet --gid "32767" "herokuishuser" \ + && adduser \ --shell /bin/bash \ --disabled-password \ --force-badname \ diff --git a/include/fn.bash b/include/fn.bash index d5231ef2b..96f0d805c 100644 --- a/include/fn.bash +++ b/include/fn.bash @@ -1,25 +1,25 @@ - fn-args() { - declare desc="Inspect a function's arguments" - local argline - argline=$(type "$1" | grep declare | grep -v "declare desc" | head -1) - echo -e "${argline// /"\n"}" | awk -F= '/=/{print "<"$1">"}' | tr "\n" " " + declare desc="Inspect a function's arguments" + local argline + argline=$(type "$1" | grep declare | grep -v "declare desc" | head -1) + echo -e "${argline// /"\n"}" | awk -F= '/=/{print "<"$1">"}' | tr "\n" " " } fn-desc() { - declare desc="Inspect a function's description" - desc="" - eval "$(type "$1" | grep desc | head -1)"; echo $desc + declare desc="Inspect a function's description" + desc="" + eval "$(type "$1" | grep desc | head -1)" + echo $desc } fn-info() { - declare desc="Inspects a function" - declare fn="$1" showsource="$2" - echo "$fn $(fn-args "$fn")" - echo " $(fn-desc "$fn")" - echo - if [[ "$showsource" ]]; then - type "$fn" | tail -n +2 - echo - fi + declare desc="Inspects a function" + declare fn="$1" showsource="$2" + echo "$fn $(fn-args "$fn")" + echo " $(fn-desc "$fn")" + echo + if [[ "$showsource" ]]; then + type "$fn" | tail -n +2 + echo + fi } diff --git a/include/herokuish.bash b/include/herokuish.bash index 234e2e559..bccb358fa 100644 --- a/include/herokuish.bash +++ b/include/herokuish.bash @@ -1,8 +1,7 @@ - if [[ "${BASH_VERSINFO[0]}" -lt "4" ]]; then - echo "!! Your system Bash is out of date: $BASH_VERSION" - echo "!! Please upgrade to Bash 4 or greater." - exit 2 + echo "!! Your system Bash is out of date: $BASH_VERSION" + echo "!! Please upgrade to Bash 4 or greater." + exit 2 fi readonly app_path="${APP_PATH:-/app}" @@ -18,139 +17,140 @@ declare unprivileged_group="${USER/nobody/nogroup}" export PS1='\[\033[01;34m\]\w\[\033[00m\] \[\033[01;32m\]$ \[\033[00m\]' ensure-paths() { - mkdir -p \ - "$app_path" \ - "$env_path" \ - "$build_path" \ - "$cache_path" \ - "$buildpack_path" + mkdir -p \ + "$app_path" \ + "$env_path" \ + "$build_path" \ + "$cache_path" \ + "$buildpack_path" } paths() { - declare desc="Shows path settings" - printf "%-32s # %s\n" \ - "APP_PATH=$app_path" "Application path during runtime" \ - "ENV_PATH=$env_path" "Path to files for defining base environment" \ - "BUILD_PATH=$build_path" "Working directory during builds" \ - "CACHE_PATH=$cache_path" "Buildpack cache location" \ - "IMPORT_PATH=$import_path" "Mounted path to copy to app path" \ - "BUILDPACK_PATH=$buildpack_path" "Path to installed buildpacks" + declare desc="Shows path settings" + printf "%-32s # %s\n" \ + "APP_PATH=$app_path" "Application path during runtime" \ + "ENV_PATH=$env_path" "Path to files for defining base environment" \ + "BUILD_PATH=$build_path" "Working directory during builds" \ + "CACHE_PATH=$cache_path" "Buildpack cache location" \ + "IMPORT_PATH=$import_path" "Mounted path to copy to app path" \ + "BUILDPACK_PATH=$buildpack_path" "Path to installed buildpacks" } version() { - declare desc="Show version and supported version info" - echo "herokuish: ${HEROKUISH_VERSION:-dev}" - echo "buildpacks:" - asset-cat include/buildpacks.txt | sed -e 's/.*heroku\///' -e 's/.*dokku\///' | xargs printf " %-26s %s\n" + declare desc="Show version and supported version info" + echo "herokuish: ${HEROKUISH_VERSION:-dev}" + echo "buildpacks:" + asset-cat include/buildpacks.txt | sed -e 's/.*heroku\///' -e 's/.*dokku\///' | xargs printf " %-26s %s\n" } title() { - echo $'\e[1G----->' "$@" + echo $'\e[1G----->' "$@" } indent() { - while read -r line; do - if [[ "$line" == --* ]] || [[ "$line" == ==* ]]; then - # shellcheck disable=SC2086 - echo $'\e[1G'$line - else - echo $'\e[1G ' "$line" - fi - done + while read -r line; do + if [[ "$line" == --* ]] || [[ "$line" == ==* ]]; then + # shellcheck disable=SC2086 + echo $'\e[1G'$line + else + echo $'\e[1G ' "$line" + fi + done } unprivileged() { - setuidgid "$unprivileged_user" "$@" + setuidgid "$unprivileged_user" "$@" } detect-unprivileged() { - unprivileged_user="$(stat -c %U "$app_path")" - unprivileged_group="${unprivileged_user/nobody/nogroup}" + unprivileged_user="$(stat -c %U "$app_path")" + unprivileged_group="${unprivileged_user/nobody/nogroup}" } randomize-unprivileged() { - local userid="$((RANDOM+1000))" - local username="u${userid}" - - addgroup --quiet --gid "$userid" "$username" - adduser \ - --shell /bin/bash \ - --disabled-password \ - --force-badname \ - --no-create-home \ - --uid "$userid" \ - --gid "$userid" \ - --gecos '' \ - --quiet \ - --home "$app_path" \ - "$username" - - unprivileged_user="$username" - unprivileged_group="$username" + local userid="$((RANDOM + 1000))" + local username="u${userid}" + + addgroup --quiet --gid "$userid" "$username" + adduser \ + --shell /bin/bash \ + --disabled-password \ + --force-badname \ + --no-create-home \ + --uid "$userid" \ + --gid "$userid" \ + --gecos '' \ + --quiet \ + --home "$app_path" \ + "$username" + + unprivileged_user="$username" + unprivileged_group="$username" } herokuish-test() { - declare desc="Test running an app through Herokuish" - declare path="${1:-/}" expected="$2" - export PORT=5678 - echo "::: BUILDING APP :::" - buildpack-build - echo "::: STARTING WEB :::" - procfile-start web & - for retry in $(seq 1 30); do - sleep 1 - if ! nc -z -w 5 localhost "$PORT"; then - echo "::: RETRYING LISTENER ($retry) :::" - else - echo "::: FOUND LISTENER :::" && break - fi - done - echo "::: CHECKING APP :::" - local output - output="$(curl --fail --retry 10 --retry-delay 2 -v -s "localhost:${PORT}${path}")" - if [[ "$expected" ]]; then - sleep 1 - echo "::: APP OUTPUT :::" - echo -e "$output" - if [[ "$output" != "$expected" ]]; then - echo "::: TEST FAILED :::" - exit 2 - fi - fi - echo "::: TEST FINISHED :::" + declare desc="Test running an app through Herokuish" + declare path="${1:-/}" expected="$2" + export PORT=5678 + echo "::: BUILDING APP :::" + buildpack-build + echo "::: STARTING WEB :::" + procfile-start web & + for retry in $(seq 1 30); do + sleep 1 + if ! nc -z -w 5 localhost "$PORT"; then + echo "::: RETRYING LISTENER ($retry) :::" + else + echo "::: FOUND LISTENER :::" && break + fi + done + echo "::: CHECKING APP :::" + local output + output="$(curl --fail --retry 10 --retry-delay 2 -v -s "localhost:${PORT}${path}")" + if [[ "$expected" ]]; then + sleep 1 + echo "::: APP OUTPUT :::" + echo -e "$output" + if [[ "$output" != "$expected" ]]; then + echo "::: TEST FAILED :::" + exit 2 + fi + fi + echo "::: TEST FINISHED :::" } main() { - set -eo pipefail; [[ "$TRACE" ]] && set -x - - if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then - rm -rf "$app_path" && cp -r "$import_path" "$app_path" - fi - - cmd-export paths - cmd-export version - cmd-export herokuish-test test - - cmd-export-ns buildpack "Use and install buildpacks" - cmd-export buildpack-build - cmd-export buildpack-install - cmd-export buildpack-list - cmd-export buildpack-test - - cmd-export-ns slug "Manage application slugs" - cmd-export slug-import - cmd-export slug-generate - cmd-export slug-export - - cmd-export-ns procfile "Use Procfiles and run app commands" - cmd-export procfile-start - cmd-export procfile-exec - cmd-export procfile-parse - - case "$SELF" in - /start) procfile-start "$@";; - /exec) procfile-exec "$@";; - /build) buildpack-build;; - *) cmd-ns "" "$@"; - esac + set -eo pipefail + [[ "$TRACE" ]] && set -x + + if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then + rm -rf "$app_path" && cp -r "$import_path" "$app_path" + fi + + cmd-export paths + cmd-export version + cmd-export herokuish-test test + + cmd-export-ns buildpack "Use and install buildpacks" + cmd-export buildpack-build + cmd-export buildpack-install + cmd-export buildpack-list + cmd-export buildpack-test + + cmd-export-ns slug "Manage application slugs" + cmd-export slug-import + cmd-export slug-generate + cmd-export slug-export + + cmd-export-ns procfile "Use Procfiles and run app commands" + cmd-export procfile-start + cmd-export procfile-exec + cmd-export procfile-parse + + case "$SELF" in + /start) procfile-start "$@" ;; + /exec) procfile-exec "$@" ;; + /build) buildpack-build ;; + *) cmd-ns "" "$@" ;; + esac } diff --git a/include/procfile.bash b/include/procfile.bash index 431a77389..5bee2f9f5 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -1,127 +1,125 @@ - yaml-esque-keys() { - declare desc="Get process type keys from colon-separated structure" - while read -r line || [[ -n "$line" ]]; do - [[ "$line" =~ ^#.* ]] && continue - [[ "$line" == *:* ]] || continue - key=${line%%:*} - echo "$key" - done <<< "$(cat)" + declare desc="Get process type keys from colon-separated structure" + while read -r line || [[ -n "$line" ]]; do + [[ "$line" =~ ^#.* ]] && continue + [[ "$line" == *:* ]] || continue + key=${line%%:*} + echo "$key" + done <<<"$(cat)" } yaml-esque-get() { - declare desc="Get key value from colon-separated structure" - declare key="$1" - local inputkey cmd - while read -r line || [[ -n "$line" ]]; do - [[ "$line" =~ ^#.* ]] && continue - inputkey=${line%%:*} - cmd=${line#*:} - if [[ "$inputkey" == "$key" ]]; then - echo "$cmd" - break - fi - done <<< "$(cat)" + declare desc="Get key value from colon-separated structure" + declare key="$1" + local inputkey cmd + while read -r line || [[ -n "$line" ]]; do + [[ "$line" =~ ^#.* ]] && continue + inputkey=${line%%:*} + cmd=${line#*:} + if [[ "$inputkey" == "$key" ]]; then + echo "$cmd" + break + fi + done <<<"$(cat)" } procfile-parse() { - declare desc="Get command string for a process type from Procfile" - declare type="$1" - # app_path is defined in outer scope - # shellcheck disable=SC2154 - cat "$app_path/Procfile" | yaml-esque-get "$type" + declare desc="Get command string for a process type from Procfile" + declare type="$1" + # app_path is defined in outer scope + # shellcheck disable=SC2154 + cat "$app_path/Procfile" | yaml-esque-get "$type" } procfile-start() { - declare desc="Run process type command from Procfile through exec" - declare type="$1" - local processcmd - processcmd="$(procfile-parse "$type")" - if [[ -z "$processcmd" ]]; then - echo "Proc entrypoint ${type} does not exist. Please check your Procfile" - exit 1 - else - procfile-exec "$processcmd" - fi + declare desc="Run process type command from Procfile through exec" + declare type="$1" + local processcmd + processcmd="$(procfile-parse "$type")" + if [[ -z "$processcmd" ]]; then + echo "Proc entrypoint ${type} does not exist. Please check your Procfile" + exit 1 + else + procfile-exec "$processcmd" + fi } procfile-exec() { - declare desc="Run as unprivileged user with Heroku-like env" - [[ "$USER" ]] || detect-unprivileged - procfile-setup-home - cd "$app_path" || return 1 - procfile-load-env - procfile-load-profile - # unprivileged_user is defined in outer scope - # shellcheck disable=SC2154,SC2046 - if [[ "$HEROKUISH_SETUIDGUID" == "false" ]]; then - exec $(eval echo "$@") - else - exec setuidgid "$unprivileged_user" $(eval echo "$@") - fi + declare desc="Run as unprivileged user with Heroku-like env" + [[ "$USER" ]] || detect-unprivileged + procfile-setup-home + cd "$app_path" || return 1 + procfile-load-env + procfile-load-profile + # unprivileged_user is defined in outer scope + # shellcheck disable=SC2154,SC2046 + if [[ "$HEROKUISH_SETUIDGUID" == "false" ]]; then + exec $(eval echo "$@") + else + exec setuidgid "$unprivileged_user" $(eval echo "$@") + fi } procfile-types() { - title "Discovering process types" - if [[ -f "$app_path/Procfile" ]]; then - local types - types="$(cat "$app_path/Procfile" | yaml-esque-keys | sort | uniq | xargs echo)" - echo "Procfile declares types -> ${types// /, }" - return - fi - if [[ -s "$app_path/.release" ]]; then - local default_types - default_types="$(cat "$app_path/.release" | yaml-keys default_process_types | xargs echo)" - # selected_name is defined in outer scope - # shellcheck disable=SC2154 - [[ "$default_types" ]] && \ - echo "Default types for $selected_name -> ${default_types// /, }" - for type in $default_types; do - echo "$type: $(cat "$app_path/.release" | yaml-get default_process_types "$type")" >> "$app_path/Procfile" - done - return - fi - echo "No process types found" + title "Discovering process types" + if [[ -f "$app_path/Procfile" ]]; then + local types + types="$(cat "$app_path/Procfile" | yaml-esque-keys | sort | uniq | xargs echo)" + echo "Procfile declares types -> ${types// /, }" + return + fi + if [[ -s "$app_path/.release" ]]; then + local default_types + default_types="$(cat "$app_path/.release" | yaml-keys default_process_types | xargs echo)" + # selected_name is defined in outer scope + # shellcheck disable=SC2154 + [[ "$default_types" ]] && echo "Default types for $selected_name -> ${default_types// /, }" + for type in $default_types; do + echo "$type: $(cat "$app_path/.release" | yaml-get default_process_types "$type")" >>"$app_path/Procfile" + done + return + fi + echo "No process types found" } procfile-load-env() { - local varname - # env_path is defined in outer scope - # shellcheck disable=SC2154 - if [[ -d "$env_path" ]]; then - shopt -s nullglob - for e in $env_path/*; do - varname=$(basename "$e") - export "$varname=$(cat "$e")" - done - fi + local varname + # env_path is defined in outer scope + # shellcheck disable=SC2154 + if [[ -d "$env_path" ]]; then + shopt -s nullglob + for e in $env_path/*; do + varname=$(basename "$e") + export "$varname=$(cat "$e")" + done + fi } procfile-load-profile() { - shopt -s nullglob - for file in /etc/profile.d/*.sh; do - # shellcheck disable=SC1090 - source "$file" - done - mkdir -p "$app_path/.profile.d" - for file in $app_path/.profile.d/*.sh; do - # shellcheck disable=SC1090 - source "$file" - done - if [[ -s "$app_path/.profile" ]]; then - # shellcheck disable=SC1090 - source "$app_path/.profile" - fi - shopt -u nullglob - hash -r + shopt -s nullglob + for file in /etc/profile.d/*.sh; do + # shellcheck disable=SC1090 + source "$file" + done + mkdir -p "$app_path/.profile.d" + for file in $app_path/.profile.d/*.sh; do + # shellcheck disable=SC1090 + source "$file" + done + if [[ -s "$app_path/.profile" ]]; then + # shellcheck disable=SC1090 + source "$app_path/.profile" + fi + shopt -u nullglob + hash -r } procfile-setup-home() { - export HOME="$app_path" - usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 - if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then - # unprivileged_user & unprivileged_group are defined in outer scope - # shellcheck disable=SC2154 - find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" - fi + export HOME="$app_path" + usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 + if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then + # unprivileged_user & unprivileged_group are defined in outer scope + # shellcheck disable=SC2154 + find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" + fi } diff --git a/include/slug.bash b/include/slug.bash index 9b7954eac..a198a2c27 100644 --- a/include/slug.bash +++ b/include/slug.bash @@ -1,54 +1,53 @@ - readonly slug_path="/tmp/slug.tgz" slug-import() { - declare desc="Import a gzipped slug tarball from URL or STDIN " - declare url="$1" - ensure-paths - # app_path defined in outer scope - # shellcheck disable=SC2154 - if [[ "$(ls -A "$app_path")" ]]; then - return 1 - elif [[ "$url" ]]; then - curl -s --retry 2 "$url" | tar -xzC "$app_path" - else - cat | tar -xzC "$app_path" - fi + declare desc="Import a gzipped slug tarball from URL or STDIN " + declare url="$1" + ensure-paths + # app_path defined in outer scope + # shellcheck disable=SC2154 + if [[ "$(ls -A "$app_path")" ]]; then + return 1 + elif [[ "$url" ]]; then + curl -s --retry 2 "$url" | tar -xzC "$app_path" + else + cat | tar -xzC "$app_path" + fi } slug-generate() { - declare desc="Generate a gzipped slug tarball from the current app" - ensure-paths - local compress_option="-z" - if which pigz > /dev/null; then - compress_option="--use-compress-program=pigz" - fi - local slugignore_option - if [[ -f "$app_path/.slugignore" ]]; then - slugignore_option="-X $app_path/.slugignore" - fi - # slugignore_option may be empty - # shellcheck disable=SC2086 - tar "$compress_option" $slugignore_option \ - --exclude='.git' \ - -C "$app_path" \ - -cf "$slug_path" \ - . - local slug_size - slug_size="$(du -Sh "$slug_path" | cut -f1)" - title "Compiled slug size is $slug_size" + declare desc="Generate a gzipped slug tarball from the current app" + ensure-paths + local compress_option="-z" + if which pigz >/dev/null; then + compress_option="--use-compress-program=pigz" + fi + local slugignore_option + if [[ -f "$app_path/.slugignore" ]]; then + slugignore_option="-X $app_path/.slugignore" + fi + # slugignore_option may be empty + # shellcheck disable=SC2086 + tar "$compress_option" $slugignore_option \ + --exclude='.git' \ + -C "$app_path" \ + -cf "$slug_path" \ + . + local slug_size + slug_size="$(du -Sh "$slug_path" | cut -f1)" + title "Compiled slug size is $slug_size" } slug-export() { - declare desc="Export generated slug tarball to URL (PUT) or STDOUT" - declare url="$1" - ensure-paths - if [[ ! -f "$slug_path" ]]; then - return 1 - fi - if [[ "$url" ]]; then - curl -0 -s -o /dev/null --retry 2 -X PUT -T "$slug_path" "$url" - else - cat "$slug_path" - fi + declare desc="Export generated slug tarball to URL (PUT) or STDOUT" + declare url="$1" + ensure-paths + if [[ ! -f "$slug_path" ]]; then + return 1 + fi + if [[ "$url" ]]; then + curl -0 -s -o /dev/null --retry 2 -X PUT -T "$slug_path" "$url" + else + cat "$slug_path" + fi } diff --git a/tests/functional/tests.sh b/tests/functional/tests.sh index 749efa621..d9c61d8c4 100644 --- a/tests/functional/tests.sh +++ b/tests/functional/tests.sh @@ -1,47 +1,46 @@ - herokuish-test() { - declare name="$1" script="$2" - # shellcheck disable=SC2046,SC2154 - docker run $([[ "$CI" ]] || echo "--rm") -v "$PWD:/mnt" \ - "herokuish:dev" bash -c "set -e; $script" \ - || $T_fail "$name exited non-zero" + declare name="$1" script="$2" + # shellcheck disable=SC2046,SC2154 + docker run $([[ "$CI" ]] || echo "--rm") -v "$PWD:/mnt" \ + "herokuish:dev" bash -c "set -e; $script" \ + || $T_fail "$name exited non-zero" } fn-source() { - # use this if you want to write tests - # in functions instead of strings. - # see test-binary for trivial example - # shellcheck disable=SC2086 - declare -f $1 | tail -n +2 + # use this if you want to write tests + # in functions instead of strings. + # see test-binary for trivial example + # shellcheck disable=SC2086 + declare -f $1 | tail -n +2 } function cleanup { - echo "Tests cleanup" - local procfile - procfile="$(cd "$( dirname "${BASH_SOURCE[0]}")" && pwd )/Procfile" - if [[ -f "$procfile" ]]; then - rm -f "$procfile" - fi + echo "Tests cleanup" + local procfile + procfile="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/Procfile" + if [[ -f "$procfile" ]]; then + rm -f "$procfile" + fi } trap cleanup EXIT T_binary() { - _test-binary() { - herokuish - } - herokuish-test "test-binary" "$(fn-source _test-binary)" + _test-binary() { + herokuish + } + herokuish-test "test-binary" "$(fn-source _test-binary)" } T_default-user() { - _test-user() { - id herokuishuser - } - herokuish-test "test-user" "$(fn-source _test-user)" + _test-user() { + id herokuishuser + } + herokuish-test "test-user" "$(fn-source _test-user)" } T_generate-slug() { - herokuish-test "test-slug-generate" " + herokuish-test "test-slug-generate" " herokuish slug generate tar tzf /tmp/slug.tgz" } diff --git a/tests/unit/tests.sh b/tests/unit/tests.sh index 8733faff5..e03ceb066 100644 --- a/tests/unit/tests.sh +++ b/tests/unit/tests.sh @@ -1,197 +1,196 @@ - -T_envfile-parse(){ - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/buildpack.bash" - local fixture_filename - local foo_expected='Hello'$'\n'' '\''world'\'' ' - local bar_expected='te'\''st' - local nested_foo_expected=foo - local nested_bar_expected=foo - - fixture_filename="$(dirname "${BASH_SOURCE[0]}")/fixtures/complicated_envfile" - eval "$(cat "$fixture_filename" | _envfile-parse)" - - # shellcheck disable=2154 - if [[ ! "$foo_expected" == "$foo" ]]; then - echo "Expected foo = $foo_expected got: $foo" - return 1 - fi - - # shellcheck disable=2154 - if [[ ! "$bar_expected" == "$bar" ]]; then - echo "Expected bar = $bar_expected got: $bar" - return 2 - fi - - # shellcheck disable=2154 - if [[ ! "$nested_foo_expected" == "$nested_foo" ]]; then - echo "Expected nested_foo = $nested_foo_expected got: $nested_foo" - return 3 - fi - - # shellcheck disable=2154 - if [[ ! "$nested_bar_expected" == "$nested_bar" ]]; then - echo "Expected nested_bar = $nested_bar_expected got: $nested_bar" - return 4 - fi +T_envfile-parse() { + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/buildpack.bash" + local fixture_filename + local foo_expected='Hello'$'\n'' '\''world'\'' ' + local bar_expected='te'\''st' + local nested_foo_expected=foo + local nested_bar_expected=foo + + fixture_filename="$(dirname "${BASH_SOURCE[0]}")/fixtures/complicated_envfile" + eval "$(cat "$fixture_filename" | _envfile-parse)" + + # shellcheck disable=2154 + if [[ ! "$foo_expected" == "$foo" ]]; then + echo "Expected foo = $foo_expected got: $foo" + return 1 + fi + + # shellcheck disable=2154 + if [[ ! "$bar_expected" == "$bar" ]]; then + echo "Expected bar = $bar_expected got: $bar" + return 2 + fi + + # shellcheck disable=2154 + if [[ ! "$nested_foo_expected" == "$nested_foo" ]]; then + echo "Expected nested_foo = $nested_foo_expected got: $nested_foo" + return 3 + fi + + # shellcheck disable=2154 + if [[ ! "$nested_bar_expected" == "$nested_bar" ]]; then + echo "Expected nested_bar = $nested_bar_expected got: $nested_bar" + return 4 + fi } T_procfile-parse-valid() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" - for type in web worker; do - case "$type" in - web) - expected="npm start" - ;; - worker) - expected="npm worker" - ;; - esac - actual=$(procfile-parse "$type" | xargs) - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi - done + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" + for type in web worker; do + case "$type" in + web) + expected="npm start" + ;; + worker) + expected="npm worker" + ;; + esac + actual=$(procfile-parse "$type" | xargs) + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi + done } T_procfile-parse-merge-conflict() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" - for type in web worker; do - case "$type" in - web) - expected="npm start" - ;; - worker) - expected="npm worker" - ;; - esac - actual=$(procfile-parse "$type" | xargs) - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi - done + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" + for type in web worker; do + case "$type" in + web) + expected="npm start" + ;; + worker) + expected="npm worker" + ;; + esac + actual=$(procfile-parse "$type" | xargs) + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi + done } T_procfile-parse-invalid() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" - - expected="Proc entrypoint invalid-proc does not exist. Please check your Procfile" - actual="$(procfile-start invalid-proc)" - - if [[ "$actual" != "$expected" ]]; then - echo "procfile-start did not throw error for invalid procfile" - return 1 - fi + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" + + expected="Proc entrypoint invalid-proc does not exist. Please check your Procfile" + actual="$(procfile-start invalid-proc)" + + if [[ "$actual" != "$expected" ]]; then + echo "procfile-start did not throw error for invalid procfile" + return 1 + fi } T_procfile-types() { - title() { - : - } - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" - - expected="Procfile declares types -> web, worker" - actual="$(procfile-types invalid-proc | tail -1)" - - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi + title() { + : + } + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" + + expected="Procfile declares types -> web, worker" + actual="$(procfile-types invalid-proc | tail -1)" + + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi } T_procfile-types-merge-conflict() { - title() { - : - } - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" - - expected="Procfile declares types -> web, worker" - actual="$(procfile-types invalid-proc | tail -1)" - - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi + title() { + : + } + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" + + expected="Procfile declares types -> web, worker" + actual="$(procfile-types invalid-proc | tail -1)" + + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi } T_procfile-load-env() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path env_path - env_path="$(dirname "${BASH_SOURCE[0]}")/fixtures/env" - - procfile-load-env - actual="$TEST_BUILDPACK_URL" - expected="$(cat "$env_path/TEST_BUILDPACK_URL")" - - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi - unset TEST_BUILDPACK_URL + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path env_path + env_path="$(dirname "${BASH_SOURCE[0]}")/fixtures/env" + + procfile-load-env + actual="$TEST_BUILDPACK_URL" + expected="$(cat "$env_path/TEST_BUILDPACK_URL")" + + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi + unset TEST_BUILDPACK_URL } T_procfile-load-profile() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual app_path - app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" - - procfile-load-profile - actual="$TEST_APP_TYPE" - expected="nodejs" - - if [[ "$actual" != "$expected" ]]; then - echo "$actual != $expected" - return 1 - fi + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual app_path + app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" + + procfile-load-profile + actual="$TEST_APP_TYPE" + expected="nodejs" + + if [[ "$actual" != "$expected" ]]; then + echo "$actual != $expected" + return 1 + fi } #the following two tests needs to launch an invalid command, #or else shell is hijacked by suceeding exec, so rather than no test #it is better to pass a failing cmd, so that we can check we pass exec step T_procfile-exec() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual - actual=procfile-exec invalid - expected=".*invalid: command not found.*" + actual=procfile-exec invalid + expected=".*invalid: command not found.*" - if [[ "$actual" =~ $expected ]]; then - echo "$actual =~ $expected" - return 1 - fi + if [[ "$actual" =~ $expected ]]; then + echo "$actual =~ $expected" + return 1 + fi } T_procfile-exec-setuidgid-optout() { - # shellcheck disable=SC1090 - source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" - local expected actual - - HEROKUISH_SETUIDGUID=false - actual=procfile-exec invalid - expected=".*invalid: command not found.*" - - if [[ "$actual" =~ $expected ]]; then - echo "$actual =~ $expected" - return 1 - fi + # shellcheck disable=SC1090 + source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" + local expected actual + + HEROKUISH_SETUIDGUID=false + actual=procfile-exec invalid + expected=".*invalid: command not found.*" + + if [[ "$actual" =~ $expected ]]; then + echo "$actual =~ $expected" + return 1 + fi } From b3d94a44452ae758b53ab579a258372205e932e2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 09:22:29 -0400 Subject: [PATCH 437/871] fix: correct lint errors --- .shellcheckrc | 7 +++++ CHANGELOG.md | 4 +-- README.md | 14 ++++----- .../tests/clojure-ring/test.sh | 8 +++-- buildpacks/buildpack-go/tests/go/test.sh | 6 ++-- .../buildpack-gradle/tests/gradle/test.sh | 6 ++-- .../buildpack-java/tests/java-jetty/test.sh | 6 ++-- .../buildpack-multi/tests/multi/test.sh | 6 ++-- .../tests/nodejs-express/test.sh | 6 ++-- buildpacks/buildpack-null/tests/null/test.sh | 6 ++-- buildpacks/buildpack-php/tests/php/README.md | 10 +++---- buildpacks/buildpack-play/tests/play/test.sh | 6 ++-- .../tests/python-django/test.sh | 6 ++-- .../tests/python-flask/test.sh | 6 ++-- .../buildpack-ruby/tests/ruby-sinatra/test.sh | 8 +++-- .../buildpack-scala/tests/scala/test.sh | 6 ++-- .../buildpack-static/tests/static/test.sh | 6 ++-- include/buildpack.bash | 6 ++-- include/fn.bash | 2 +- include/procfile.bash | 4 +-- tests/functional/tests.sh | 4 +++ tests/unit/tests.sh | 29 +++++++++++-------- 22 files changed, 103 insertions(+), 59 deletions(-) create mode 100644 .shellcheckrc diff --git a/.shellcheckrc b/.shellcheckrc new file mode 100644 index 000000000..e2d1334aa --- /dev/null +++ b/.shellcheckrc @@ -0,0 +1,7 @@ +disable=SC2128 +disable=SC1091 +disable=SC2002 +disable=SC2294 +disable=SC2034 +disable=SC2031 +disable=SC2030 diff --git a/CHANGELOG.md b/CHANGELOG.md index c73f453e5..f856fd6cf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -877,7 +877,7 @@ All notable changes to this project will be documented in this file. - @michaelshobbs remove erlang from buildpack bundle -**NOTE: v0.4.0 is now based on heroku-16** +> NOTE: v0.4.0 is now based on heroku-16 ## [0.3.36](https://github.com/gliderlabs/herokuish/compare/v0.3.35...v0.3.36) - 2018-03-10 @@ -890,7 +890,7 @@ All notable changes to this project will be documented in this file. - @michaelshobbs Update nodejs to version v121 - @michaelshobbs Update go to version v85 -**NOTE: This will be the last version of herokuish based on cedar-14** +> NOTE: This will be the last version of herokuish based on cedar-14 ## [0.3.35](https://github.com/gliderlabs/herokuish/compare/v0.3.34...v0.3.35) - 2018-02-09 diff --git a/README.md b/README.md index 1c607235d..f4e6b8e63 100644 --- a/README.md +++ b/README.md @@ -60,7 +60,7 @@ For example, build processes that produce Docker images without producing interm `herokuish exec` will by default drop root privileges through use of [setuidgid](https://cr.yp.to/daemontools/setuidgid.html), but if already running as a non-root user setuidgid will fail, you can opt-out from this by setting the env-var `HEROKUISH_SETUIDGUID=false`. -#### Buildpacks +### Buildpacks Herokuish does not come with any buildpacks, but it is tested against recent versions of Heroku supported buildpacks. You can see this information with `herokuish version`. Example output: @@ -78,7 +78,7 @@ buildpacks: You can install all supported buildpacks with `herokuish buildpack install`, or you can manually install buildpacks individually with `herokuish buildpack install [committish]`. You can also mount a directory containing your platform's supported buildpacks (see Paths, next section), or you could bake your supported buildpacks into an image. These are the types of decisions that are up to you. -#### Paths +### Paths Use `herokuish paths` to see relevant system paths it uses. You can use these to import or mount data for use inside a container. They can also be overridden by setting the appropriate environment variable. @@ -93,11 +93,11 @@ BUILDPACK_PATH=/tmp/buildpacks # Path to installed buildpacks ``` -#### Entrypoints +### Entrypoints Some subcommands are made to be used as default commands or entrypoint commands for containers. Specifically, herokuish detects if it was called as `/start`, `/exec`, or `/build` which will shortcut it to running those subcommands directly. This means you can either install the binary in those locations or create symlinks from those locations, allowing you to use them as your container entrypoint. -#### Help +### Help Don't be afraid of the help command. It actually tells you exactly what a command does: @@ -128,7 +128,7 @@ Having trouble pushing an app to Dokku or Heroku? Use Herokuish with a local Doc instance to debug. This is especially helpful with Dokku to help determine if it's a buildpack issue or an issue with Dokku. Buildpack issues should be filed against Herokuish. -#### Running an app against Herokuish +### Running an app against Herokuish ```shell docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish test @@ -147,7 +147,7 @@ Mounting your local app source directory to `/tmp/app` and running `/bin/herokui You can use this output when you submit issues. -#### Running an app tests using Heroku buildpacks +### Running an app tests using Heroku buildpacks ```shell docker run --rm -v /abs/app/path:/tmp/app gliderlabs/herokuish /bin/herokuish buildpack test @@ -175,7 +175,7 @@ docker run --platform linux/amd64 --rm -v /abs/app/path:/tmp/app gliderlabs/hero However, there is a risk of compatibility issues when running on a different platform than the one you are developing on. If you are getting strange compilation or segfaults, try running the build process on an x86 platform. -#### Troubleshooting +## Troubleshooting If you run into an issue and looking for more insight into what `herokuish` is doing, you can set the `$TRACE` environment variable. diff --git a/buildpacks/buildpack-clojure/tests/clojure-ring/test.sh b/buildpacks/buildpack-clojure/tests/clojure-ring/test.sh index e16c88e41..34b1ba1ed 100644 --- a/buildpacks/buildpack-clojure/tests/clojure-ring/test.sh +++ b/buildpacks/buildpack-clojure/tests/clojure-ring/test.sh @@ -1,3 +1,5 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" -buildpack-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" +buildpack-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-go/tests/go/test.sh b/buildpacks/buildpack-go/tests/go/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-go/tests/go/test.sh +++ b/buildpacks/buildpack-go/tests/go/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-gradle/tests/gradle/test.sh b/buildpacks/buildpack-gradle/tests/gradle/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-gradle/tests/gradle/test.sh +++ b/buildpacks/buildpack-gradle/tests/gradle/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-java/tests/java-jetty/test.sh b/buildpacks/buildpack-java/tests/java-jetty/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/test.sh +++ b/buildpacks/buildpack-java/tests/java-jetty/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-multi/tests/multi/test.sh b/buildpacks/buildpack-multi/tests/multi/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-multi/tests/multi/test.sh +++ b/buildpacks/buildpack-multi/tests/multi/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-nodejs/tests/nodejs-express/test.sh b/buildpacks/buildpack-nodejs/tests/nodejs-express/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-nodejs/tests/nodejs-express/test.sh +++ b/buildpacks/buildpack-nodejs/tests/nodejs-express/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-null/tests/null/test.sh b/buildpacks/buildpack-null/tests/null/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-null/tests/null/test.sh +++ b/buildpacks/buildpack-null/tests/null/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-php/tests/php/README.md b/buildpacks/buildpack-php/tests/php/README.md index ffab40166..c924496f2 100644 --- a/buildpacks/buildpack-php/tests/php/README.md +++ b/buildpacks/buildpack-php/tests/php/README.md @@ -9,11 +9,11 @@ This application supports the [Getting Started with PHP on Heroku](https://devce Install the [Heroku Toolbelt](https://toolbelt.heroku.com/). ```sh -$ git clone git@github.com:heroku/php-getting-started.git # or clone your own fork -$ cd php-getting-started -$ heroku create -$ git push heroku main -$ heroku open +git clone git@github.com:heroku/php-getting-started.git # or clone your own fork +cd php-getting-started +heroku create +git push heroku main +heroku open ``` or diff --git a/buildpacks/buildpack-play/tests/play/test.sh b/buildpacks/buildpack-play/tests/play/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-play/tests/play/test.sh +++ b/buildpacks/buildpack-play/tests/play/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-python/tests/python-django/test.sh b/buildpacks/buildpack-python/tests/python-django/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-python/tests/python-django/test.sh +++ b/buildpacks/buildpack-python/tests/python-django/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-python/tests/python-flask/test.sh b/buildpacks/buildpack-python/tests/python-flask/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-python/tests/python-flask/test.sh +++ b/buildpacks/buildpack-python/tests/python-flask/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/test.sh b/buildpacks/buildpack-ruby/tests/ruby-sinatra/test.sh index e16c88e41..34b1ba1ed 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/test.sh +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/test.sh @@ -1,3 +1,5 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" -buildpack-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" +buildpack-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-scala/tests/scala/test.sh b/buildpacks/buildpack-scala/tests/scala/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-scala/tests/scala/test.sh +++ b/buildpacks/buildpack-scala/tests/scala/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/buildpacks/buildpack-static/tests/static/test.sh b/buildpacks/buildpack-static/tests/static/test.sh index b6624e716..5287285c3 100644 --- a/buildpacks/buildpack-static/tests/static/test.sh +++ b/buildpacks/buildpack-static/tests/static/test.sh @@ -1,2 +1,4 @@ -source "$(dirname $BASH_SOURCE)/../../../test" -app-test "$(basename $(dirname $BASH_SOURCE))" +# shellcheck shell=bash + +source "$(dirname "$BASH_SOURCE")/../../../test" +app-test "$(basename "$(dirname "$BASH_SOURCE")")" diff --git a/include/buildpack.bash b/include/buildpack.bash index 93f0cb70e..e6aad56e4 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -10,6 +10,7 @@ _envfile-parse() { value="${line#*=}" case "$value" in \'* | \"*) + # shellcheck disable=SC2269 value="${value}" ;; *) @@ -45,14 +46,15 @@ _select-buildpack() { chown -R "$unprivileged_user:$unprivileged_group" "$buildpack_path/custom" selected_name="$(unprivileged "$selected_path/bin/detect" "$build_path" || true)" else + # shellcheck disable=SC2206 local buildpacks=($buildpack_path/*) local valid_buildpacks=() for buildpack in "${buildpacks[@]}"; do - unprivileged "$buildpack/bin/detect" "$build_path" &>/dev/null \ - && valid_buildpacks+=("$buildpack") + unprivileged "$buildpack/bin/detect" "$build_path" &>/dev/null && valid_buildpacks+=("$buildpack") done if [[ ${#valid_buildpacks[@]} -gt 1 ]]; then title "Warning: Multiple default buildpacks reported the ability to handle this app. The first buildpack in the list below will be used." + # shellcheck disable=SC2001 echo "Detected buildpacks: $(sed -e "s:/tmp/buildpacks/[0-9][0-9]_buildpack-::g" <<<"${valid_buildpacks[@]}")" | indent fi if [[ ${#valid_buildpacks[@]} -gt 0 ]]; then diff --git a/include/fn.bash b/include/fn.bash index 96f0d805c..3a6fa9eb1 100644 --- a/include/fn.bash +++ b/include/fn.bash @@ -9,7 +9,7 @@ fn-desc() { declare desc="Inspect a function's description" desc="" eval "$(type "$1" | grep desc | head -1)" - echo $desc + echo "$desc" } fn-info() { diff --git a/include/procfile.bash b/include/procfile.bash index 5bee2f9f5..e306ce467 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -88,7 +88,7 @@ procfile-load-env() { # shellcheck disable=SC2154 if [[ -d "$env_path" ]]; then shopt -s nullglob - for e in $env_path/*; do + for e in "$env_path"/*; do varname=$(basename "$e") export "$varname=$(cat "$e")" done @@ -102,7 +102,7 @@ procfile-load-profile() { source "$file" done mkdir -p "$app_path/.profile.d" - for file in $app_path/.profile.d/*.sh; do + for file in "$app_path/.profile.d"/*.sh; do # shellcheck disable=SC1090 source "$file" done diff --git a/tests/functional/tests.sh b/tests/functional/tests.sh index d9c61d8c4..a61b2a582 100644 --- a/tests/functional/tests.sh +++ b/tests/functional/tests.sh @@ -1,3 +1,5 @@ +# shellcheck shell=bash + herokuish-test() { declare name="$1" script="$2" # shellcheck disable=SC2046,SC2154 @@ -27,6 +29,7 @@ trap cleanup EXIT T_binary() { _test-binary() { + # shellcheck disable=SC2317 herokuish } herokuish-test "test-binary" "$(fn-source _test-binary)" @@ -34,6 +37,7 @@ T_binary() { T_default-user() { _test-user() { + # shellcheck disable=SC2317 id herokuishuser } herokuish-test "test-user" "$(fn-source _test-user)" diff --git a/tests/unit/tests.sh b/tests/unit/tests.sh index e03ceb066..2e0d1190c 100644 --- a/tests/unit/tests.sh +++ b/tests/unit/tests.sh @@ -1,5 +1,7 @@ +# shellcheck shell=bash + T_envfile-parse() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/buildpack.bash" local fixture_filename local foo_expected='Hello'$'\n'' '\''world'\'' ' @@ -8,7 +10,7 @@ T_envfile-parse() { local nested_bar_expected=foo fixture_filename="$(dirname "${BASH_SOURCE[0]}")/fixtures/complicated_envfile" - eval "$(cat "$fixture_filename" | _envfile-parse)" + eval "$(_envfile-parse <"$fixture_filename")" # shellcheck disable=2154 if [[ ! "$foo_expected" == "$foo" ]]; then @@ -36,7 +38,7 @@ T_envfile-parse() { } T_procfile-parse-valid() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" @@ -58,7 +60,7 @@ T_procfile-parse-valid() { } T_procfile-parse-merge-conflict() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" @@ -80,7 +82,7 @@ T_procfile-parse-merge-conflict() { } T_procfile-parse-invalid() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" @@ -96,9 +98,10 @@ T_procfile-parse-invalid() { T_procfile-types() { title() { + # shellcheck disable=SC2317 : } - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" @@ -114,9 +117,10 @@ T_procfile-types() { T_procfile-types-merge-conflict() { title() { + # shellcheck disable=SC2317 : } - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures-merge-conflict" @@ -131,7 +135,7 @@ T_procfile-types-merge-conflict() { } T_procfile-load-env() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path env_path env_path="$(dirname "${BASH_SOURCE[0]}")/fixtures/env" @@ -148,9 +152,10 @@ T_procfile-load-env() { } T_procfile-load-profile() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual app_path + # shellcheck disable=SC2034 app_path="$(dirname "${BASH_SOURCE[0]}")/fixtures" procfile-load-profile @@ -167,7 +172,7 @@ T_procfile-load-profile() { #or else shell is hijacked by suceeding exec, so rather than no test #it is better to pass a failing cmd, so that we can check we pass exec step T_procfile-exec() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual @@ -181,11 +186,11 @@ T_procfile-exec() { } T_procfile-exec-setuidgid-optout() { - # shellcheck disable=SC1090 + # shellcheck disable=SC1091 source "$(dirname "${BASH_SOURCE[0]}")/../../include/procfile.bash" local expected actual - HEROKUISH_SETUIDGUID=false + export HEROKUISH_SETUIDGUID=false actual=procfile-exec invalid expected=".*invalid: command not found.*" From 2d654e87459b36ddd23056e2bc29101b89b1af9a Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 09:24:10 -0400 Subject: [PATCH 438/871] fix: ignore path --- .github/workflows/lint.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index be1b4a4b8..e20f014ce 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -51,6 +51,9 @@ jobs: uses: actions/checkout@v4 - name: Run shellcheck uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 + with: + ignore_paths: >- + tests/unit/fixtures/.profile.d/app.sh shfmt: name: shfmt From ce6a3705693b5606c14bd8c242f1cc84289e2c31 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 09:25:07 -0400 Subject: [PATCH 439/871] chore: remove lint call --- .github/workflows/main.yml | 3 --- Makefile | 12 ------------ 2 files changed, 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f60747b8e..4d432b551 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -51,9 +51,6 @@ jobs: - name: shellcheck run: make shellcheck - - name: lint - run: make lint - - name: install requirements run: make deps fpm package_cloud diff --git a/Makefile b/Makefile index ebde00d18..dc76b33a5 100644 --- a/Makefile +++ b/Makefile @@ -159,18 +159,6 @@ ci-report: ruby -v rm -f ~/.gitconfig -lint: - # SC2002: Useless cat - https://github.com/koalaman/shellcheck/wiki/SC2002 - # SC2030: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2030 - # SC2031: Modification of name is local - https://github.com/koalaman/shellcheck/wiki/SC2031 - # SC2034: VAR appears unused - https://github.com/koalaman/shellcheck/wiki/SC2034 - # SC2206: Quote to prevent word splitting/globbing, or split robustly with mapfile or read -a. - # SC2001: See if you can use ${variable//search/replace} instead. - # SC2231: Quote expansions in this for loop glob to prevent wordsplitting, e.g. "$dir"/*.txt . - # SC2230: which is non-standard. Use builtin 'command -v' instead. - @echo linting... - shellcheck -e SC2002,SC2030,SC2031,SC2034,SC2206,SC2001,SC2231,SC2230 -s bash include/*.bash tests/**/tests.sh - release: build/rpm/$(NAME)-$(VERSION)-1.x86_64.rpm build/deb/$(NAME)_$(VERSION)_all.deb bin/gh-release bin/gh-release-body ls -lah build build/* || true chmod +x build/linux/$(NAME) build/darwin/$(NAME) From f2e9c4089666ffed867eda8cf567ede57a494830 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 09:26:05 -0400 Subject: [PATCH 440/871] fix: use correct path --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e20f014ce..858d0cc6b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -53,7 +53,7 @@ jobs: uses: ludeeus/action-shellcheck@00cae500b08a931fb5698e11e79bfbd38e612a38 with: ignore_paths: >- - tests/unit/fixtures/.profile.d/app.sh + ./tests/unit/fixtures/.profile.d/app.sh shfmt: name: shfmt From e9232afe6852fcfda72d924fe5b6b43d925d5b9e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 08:52:48 -0400 Subject: [PATCH 441/871] fix: ensure all file permissions are set to specified unprivileged user This change avoids a potentially heavy chown operation at the start of the container process - in fact, it may even allow us to drop perm changes completely - by ensuring any created files are _always_ set to the correct permissions. --- include/buildpack.bash | 9 +++++++-- include/procfile.bash | 7 ++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index e6aad56e4..9b9dc25fc 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -162,6 +162,9 @@ buildpack-setup() { # shellcheck disable=SC2154 usermod --home "$HOME" "$unprivileged_user" >/dev/null 2>&1 + # shellcheck disable=SC2154 + chown "$unprivileged_user:$unprivileged_group" "$HOME" + # Prepare permissions quicker for slower filesystems # vars defined in outer scope # shellcheck disable=SC2154 @@ -191,16 +194,18 @@ buildpack-execute() { cd "$build_path" || return 1 unprivileged "$selected_path/bin/compile" "$build_path" "$cache_path" "$env_path" if [[ -f "$selected_path/bin/release" ]]; then - unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" >"$build_path/.release" + unprivileged "$selected_path/bin/release" "$build_path" "$cache_path" | unprivileged tee "$build_path/.release" >/dev/null fi if [[ -f "$build_path/.release" ]]; then config_vars="$(cat "$build_path/.release" | yaml-get config_vars)" + unprivileged touch "$build_path/.profile.d/00_config_vars.sh" if [[ "$config_vars" ]]; then mkdir -p "$build_path/.profile.d" + chown "$unprivileged_user:$unprivileged_group" "$build_path/.profile.d" OIFS=$IFS IFS=$'\n' for var in $config_vars; do - echo "export $(echo "$var" | sed -e 's/=/="/' -e 's/$/"/')" >>"$build_path/.profile.d/00_config_vars.sh" + echo "export $(echo "$var" | sed -e 's/=/="/' -e 's/$/"/')" | unprivileged tee -a "$build_path/.profile.d/00_config_vars.sh" >/dev/null done IFS=$OIFS fi diff --git a/include/procfile.bash b/include/procfile.bash index e306ce467..55abede23 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -75,7 +75,8 @@ procfile-types() { # shellcheck disable=SC2154 [[ "$default_types" ]] && echo "Default types for $selected_name -> ${default_types// /, }" for type in $default_types; do - echo "$type: $(cat "$app_path/.release" | yaml-get default_process_types "$type")" >>"$app_path/Procfile" + unprivileged touch "$app_path/Procfile" + echo "$type: $(cat "$app_path/.release" | yaml-get default_process_types "$type")" | unprivileged tee -a "$app_path/Procfile" >/dev/null done return fi @@ -102,6 +103,7 @@ procfile-load-profile() { source "$file" done mkdir -p "$app_path/.profile.d" + chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" for file in "$app_path/.profile.d"/*.sh; do # shellcheck disable=SC1090 source "$file" @@ -116,7 +118,10 @@ procfile-load-profile() { procfile-setup-home() { export HOME="$app_path" + # shellcheck disable=SC2154 usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 + # shellcheck disable=SC2154 + chown "$unprivileged_user:$unprivileged_group" "$app_path" if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then # unprivileged_user & unprivileged_group are defined in outer scope # shellcheck disable=SC2154 From fa8df04ba2ffe710e004600e80b7228d12acf814 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 15:42:21 -0400 Subject: [PATCH 442/871] fix: correct lint issue --- include/procfile.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/include/procfile.bash b/include/procfile.bash index 55abede23..c53270c2a 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -103,6 +103,7 @@ procfile-load-profile() { source "$file" done mkdir -p "$app_path/.profile.d" + # shellcheck disable=SC2154 chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" for file in "$app_path/.profile.d"/*.sh; do # shellcheck disable=SC1090 From e1877f577808b07e961e646dcecbf4a2101649c4 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Wed, 17 Jul 2019 05:10:21 +1000 Subject: [PATCH 443/871] Only copy from app import path (e.g. /tmp/app) to build path (e.g. /app) when building --- include/buildpack.bash | 5 +++++ include/herokuish.bash | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index 9b9dc25fc..090282a12 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -145,6 +145,11 @@ buildpack-list() { } buildpack-setup() { + # shellcheck disable=SC2154 + if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then + rm -rf "$app_path" && cp -r "$import_path" "$app_path" + fi + # Buildpack expectations # app_path defined in outer scope # shellcheck disable=SC2154 diff --git a/include/herokuish.bash b/include/herokuish.bash index bccb358fa..228a54730 100644 --- a/include/herokuish.bash +++ b/include/herokuish.bash @@ -123,10 +123,6 @@ main() { set -eo pipefail [[ "$TRACE" ]] && set -x - if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then - rm -rf "$app_path" && cp -r "$import_path" "$app_path" - fi - cmd-export paths cmd-export version cmd-export herokuish-test test From 3beadaacfeb3399ff6a2581518758764e03bc5f5 Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Thu, 18 Jul 2019 09:53:59 +1000 Subject: [PATCH 444/871] $import_path is defined in outer scope. --- include/buildpack.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/include/buildpack.bash b/include/buildpack.bash index 090282a12..fd7c29bb0 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -145,6 +145,7 @@ buildpack-list() { } buildpack-setup() { + # $import_path is defined in outer scope # shellcheck disable=SC2154 if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then rm -rf "$app_path" && cp -r "$import_path" "$app_path" From 7a1c10f234c1e5816c56ee4e04f9e373e153f9af Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Tue, 23 Jul 2019 03:35:19 +1000 Subject: [PATCH 445/871] Formatting change only. Switch from using spaces to tabs. --- include/buildpack.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index fd7c29bb0..ae9fb1abf 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -145,11 +145,11 @@ buildpack-list() { } buildpack-setup() { - # $import_path is defined in outer scope - # shellcheck disable=SC2154 - if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then - rm -rf "$app_path" && cp -r "$import_path" "$app_path" - fi + # $import_path is defined in outer scope + # shellcheck disable=SC2154 + if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then + rm -rf "$app_path" && cp -r "$import_path" "$app_path" + fi # Buildpack expectations # app_path defined in outer scope From 80904f5ea6894e1e755b48e6653e3dd44646e030 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 17:29:26 -0400 Subject: [PATCH 446/871] fix: correct lint issue --- include/buildpack.bash | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/include/buildpack.bash b/include/buildpack.bash index ae9fb1abf..fd7c29bb0 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -145,11 +145,11 @@ buildpack-list() { } buildpack-setup() { - # $import_path is defined in outer scope - # shellcheck disable=SC2154 - if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then - rm -rf "$app_path" && cp -r "$import_path" "$app_path" - fi + # $import_path is defined in outer scope + # shellcheck disable=SC2154 + if [[ -d "$import_path" ]] && [[ -n "$(ls -A "$import_path")" ]]; then + rm -rf "$app_path" && cp -r "$import_path" "$app_path" + fi # Buildpack expectations # app_path defined in outer scope From 1e44d1520330308a38ea79e57f48572382556ebe Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 18:18:55 -0400 Subject: [PATCH 447/871] Release 0.8.0 - #1093 @dependabot: chore(deps): bump actions/download-artifact from 3 to 4 - #1173 @josegonzalez: Use find to identify only files not already owned by user - #1174 @josegonzalez: Add linting to CI - #1175 @josegonzalez: Ensure all file permissions are set to specified unprivileged user - #467 @mlandauer: Only copy from app import path to app path when building --- CHANGELOG.md | 8 ++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f856fd6cf..9db71066c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,14 @@ All notable changes to this project will be documented in this file. +## [0.8.0](https://github.com/gliderlabs/herokuish/compare/v0.7.6...v0.8.0) - 2024-03-28 + +- #1093 @dependabot: chore(deps): bump actions/download-artifact from 3 to 4 +- #1173 @josegonzalez: Use find to identify only files not already owned by user +- #1174 @josegonzalez: Add linting to CI +- #1175 @josegonzalez: Ensure all file permissions are set to specified unprivileged user +- #467 @mlandauer: Only copy from app import path to app path when building + ## [0.7.6](https://github.com/gliderlabs/herokuish/compare/v0.7.5...v0.7.6) - 2024-03-28 - #1171 @josegonzalez: Use a run mount to add build dependencies diff --git a/Makefile b/Makefile index dc76b33a5..6cd461c82 100644 --- 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.7.6 +VERSION ?= 0.8.0 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index f4e6b8e63..bd41b2cdd 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.7.6-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.8.0-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.7.6/herokuish_0.7.6_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.8.0/herokuish_0.8.0_linux_x86_64.tgz \ | tar -xzC /bin ``` From 4b6513ccd60692a04a27b2e800e66b81cfa5e864 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 29 Mar 2024 13:38:43 +0000 Subject: [PATCH 448/871] Update php to version v248 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index d0a08b740..bb895b71d 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v247 +v248 From f660b083f221105a0d0c8f66337a4280b91558f2 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 00:58:20 -0400 Subject: [PATCH 449/871] chore: update dependencies in scala test app --- buildpacks/buildpack-scala/tests/scala/project/build.properties | 2 +- buildpacks/buildpack-scala/tests/scala/project/plugins.sbt | 2 +- buildpacks/buildpack-scala/tests/scala/system.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildpacks/buildpack-scala/tests/scala/project/build.properties b/buildpacks/buildpack-scala/tests/scala/project/build.properties index 1a1a23239..78dfece3a 100644 --- a/buildpacks/buildpack-scala/tests/scala/project/build.properties +++ b/buildpacks/buildpack-scala/tests/scala/project/build.properties @@ -1,4 +1,4 @@ #Activator-generated Properties #Wed Aug 13 09:36:12 CDT 2014 template.uuid=a855816c-0367-44ba-9adb-6a903f6ad599 -sbt.version=0.13.11 +sbt.version=1.9.9 diff --git a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt index cf3a834eb..7d50cc40a 100644 --- a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt +++ b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt @@ -10,4 +10,4 @@ resolvers += "Maven Central Server" at "https://repo1.maven.org/maven2" // The "public" repository resolvers += "public" at "https://repo1.maven.org/maven2" -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "0.7.5-RC2") +addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.9.16") diff --git a/buildpacks/buildpack-scala/tests/scala/system.properties b/buildpacks/buildpack-scala/tests/scala/system.properties index 97270b43f..5e8606c89 100644 --- a/buildpacks/buildpack-scala/tests/scala/system.properties +++ b/buildpacks/buildpack-scala/tests/scala/system.properties @@ -1 +1 @@ -java.runtime.version=1.7 +java.runtime.version=1.8 From 41b53fc0869537718128fca4d9d84ecd8a6aad7f Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 01:29:17 -0400 Subject: [PATCH 450/871] fix: use new source for sbt-native-packager --- buildpacks/buildpack-scala/tests/scala/project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt index 7d50cc40a..403414696 100644 --- a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt +++ b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt @@ -10,4 +10,4 @@ resolvers += "Maven Central Server" at "https://repo1.maven.org/maven2" // The "public" repository resolvers += "public" at "https://repo1.maven.org/maven2" -addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.9.16") +addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") From d3c3b518b61883e1f84682371ac4c194d12a5844 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 02:24:14 -0400 Subject: [PATCH 451/871] chore: use scala-getting-started app as sample app Rather than try and upgrade the old scala app, just use the one heroku supports. --- buildpacks/buildpack-scala/tests/scala/.env | 1 + .../$model__Camel$Controller.scala | 46 +++++++++ .../app/views/$model__camel$/form.scala.html | 12 +++ .../tests/scala/.g8/form/default.properties | 2 + .../$model__Camel$ControllerSpec.scala | 71 ++++++++++++++ .../tests/scala/.github/CODEOWNERS | 3 + .../buildpack-scala/tests/scala/.gitignore | 9 ++ .../buildpack-scala/tests/scala/LICENSE | 21 ++++ .../buildpack-scala/tests/scala/Procfile | 2 +- .../tests/scala/Procfile.windows | 1 + .../buildpack-scala/tests/scala/README.md | 21 ++++ .../buildpack-scala/tests/scala/app.json | 5 + .../scala/app/controllers/Application.scala | 33 +++++++ .../tests/scala/app/views/index.scala.html | 91 ++++++++++++++++++ .../tests/scala/app/views/main.scala.html | 70 ++++++++++++++ .../tests/scala/app/views/nav.scala.html | 33 +++++++ .../buildpack-scala/tests/scala/build.sbt | 26 +++-- .../buildpack-scala/tests/scala/build.sc | 10 ++ .../tests/scala/conf/application.conf | 23 +++++ .../tests/scala/conf/logback.xml | 40 ++++++++ .../buildpack-scala/tests/scala/conf/messages | 1 + .../buildpack-scala/tests/scala/conf/routes | 10 ++ .../tests/scala/project/build.properties | 5 +- .../tests/scala/project/plugins.sbt | 15 +-- .../tests/scala/public/images/favicon.png | Bin 0 -> 687 bytes .../tests/scala/public/images/lang-logo.png | Bin 0 -> 1097 bytes .../tests/scala/public/stylesheets/main.css | 39 ++++++++ .../tests/scala/src/main/scala/web.scala | 25 ----- .../tests/scala/system.properties | 3 +- 29 files changed, 565 insertions(+), 53 deletions(-) create mode 100644 buildpacks/buildpack-scala/tests/scala/.env create mode 100644 buildpacks/buildpack-scala/tests/scala/.g8/form/app/controllers/$model__Camel$Controller.scala create mode 100644 buildpacks/buildpack-scala/tests/scala/.g8/form/app/views/$model__camel$/form.scala.html create mode 100644 buildpacks/buildpack-scala/tests/scala/.g8/form/default.properties create mode 100644 buildpacks/buildpack-scala/tests/scala/.g8/form/test/controllers/$model__Camel$ControllerSpec.scala create mode 100644 buildpacks/buildpack-scala/tests/scala/.github/CODEOWNERS create mode 100644 buildpacks/buildpack-scala/tests/scala/.gitignore create mode 100644 buildpacks/buildpack-scala/tests/scala/LICENSE create mode 100644 buildpacks/buildpack-scala/tests/scala/Procfile.windows create mode 100644 buildpacks/buildpack-scala/tests/scala/README.md create mode 100644 buildpacks/buildpack-scala/tests/scala/app.json create mode 100644 buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala create mode 100644 buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html create mode 100644 buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html create mode 100644 buildpacks/buildpack-scala/tests/scala/app/views/nav.scala.html create mode 100644 buildpacks/buildpack-scala/tests/scala/build.sc create mode 100644 buildpacks/buildpack-scala/tests/scala/conf/application.conf create mode 100644 buildpacks/buildpack-scala/tests/scala/conf/logback.xml create mode 100644 buildpacks/buildpack-scala/tests/scala/conf/messages create mode 100644 buildpacks/buildpack-scala/tests/scala/conf/routes create mode 100644 buildpacks/buildpack-scala/tests/scala/public/images/favicon.png create mode 100644 buildpacks/buildpack-scala/tests/scala/public/images/lang-logo.png create mode 100644 buildpacks/buildpack-scala/tests/scala/public/stylesheets/main.css delete mode 100644 buildpacks/buildpack-scala/tests/scala/src/main/scala/web.scala diff --git a/buildpacks/buildpack-scala/tests/scala/.env b/buildpacks/buildpack-scala/tests/scala/.env new file mode 100644 index 000000000..e3eeb7392 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.env @@ -0,0 +1 @@ +ENERGY=20 GeV diff --git a/buildpacks/buildpack-scala/tests/scala/.g8/form/app/controllers/$model__Camel$Controller.scala b/buildpacks/buildpack-scala/tests/scala/.g8/form/app/controllers/$model__Camel$Controller.scala new file mode 100644 index 000000000..6977727b3 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.g8/form/app/controllers/$model__Camel$Controller.scala @@ -0,0 +1,46 @@ +package controllers + +import javax.inject._ +import play.api.mvc._ + +import play.api.data._ +import play.api.data.Forms._ + +case class $model;format="Camel"$Data(name: String, age: Int) + +// NOTE: Add the following to conf/routes to enable compilation of this class: +/* +GET /$model;format="camel"$ controllers.$model;format="Camel"$Controller.$model;format="camel"$Get() +POST /$model;format="camel"$ controllers.$model;format="Camel"$Controller.$model;format="camel"$Post() +*/ + +/** + * $model;format="Camel"$ form controller for Play Scala + */ +class $model;format="Camel"$Controller @Inject()(mcc: MessagesControllerComponents) extends MessagesAbstractController(mcc) { + + val $model;format="camel"$Form = Form( + mapping( + "name" -> text, + "age" -> number + )($model;format="Camel"$Data.apply)($model;format="Camel"$Data.unapply) + ) + + def $model;format="camel"$Get() = Action { implicit request: MessagesRequest[AnyContent] => + Ok(views.html.$model;format="camel"$.form($model;format="camel"$Form)) + } + + def $model;format="camel"$Post() = Action { implicit request: MessagesRequest[AnyContent] => + $model;format="camel"$Form.bindFromRequest().fold( + formWithErrors => { + // binding failure, you retrieve the form containing errors: + BadRequest(views.html.$model;format="camel"$.form(formWithErrors)) + }, + $model;format="camel"$Data => { + /* binding success, you get the actual value. */ + /* flashing uses a short lived cookie */ + Redirect(routes.$model;format="Camel"$Controller.$model;format="camel"$Get()).flashing("success" -> ("Successful " + $model;format="camel"$Data.toString)) + } + ) + } +} diff --git a/buildpacks/buildpack-scala/tests/scala/.g8/form/app/views/$model__camel$/form.scala.html b/buildpacks/buildpack-scala/tests/scala/.g8/form/app/views/$model__camel$/form.scala.html new file mode 100644 index 000000000..14674ba6e --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.g8/form/app/views/$model__camel$/form.scala.html @@ -0,0 +1,12 @@ +@($model;format="camel"$Form: Form[$model;format="Camel"$Data])(implicit request: MessagesRequestHeader) + +

$model;format="camel"$ form

+ +@request.flash.get("success").getOrElse("") + +@helper.form(action = routes.$model;format="Camel"$Controller.$model;format="camel"$Post()) { + @helper.CSRF.formField + @helper.inputText($model;format="camel"$Form("name")) + @helper.inputText($model;format="camel"$Form("age")) + +} diff --git a/buildpacks/buildpack-scala/tests/scala/.g8/form/default.properties b/buildpacks/buildpack-scala/tests/scala/.g8/form/default.properties new file mode 100644 index 000000000..32090f30c --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.g8/form/default.properties @@ -0,0 +1,2 @@ +description = Generates a Controller with form handling +model = user diff --git a/buildpacks/buildpack-scala/tests/scala/.g8/form/test/controllers/$model__Camel$ControllerSpec.scala b/buildpacks/buildpack-scala/tests/scala/.g8/form/test/controllers/$model__Camel$ControllerSpec.scala new file mode 100644 index 000000000..d25174315 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.g8/form/test/controllers/$model__Camel$ControllerSpec.scala @@ -0,0 +1,71 @@ +package controllers + +import play.api.mvc._ +import play.api.i18n._ +import org.scalatestplus.play._ +import org.scalatestplus.play.guice.GuiceOneAppPerTest +import play.api.http.FileMimeTypes +import play.api.test._ +import play.api.test.Helpers._ +import play.api.test.CSRFTokenHelper._ + +import scala.concurrent.ExecutionContext + +/** + * $model;format="Camel"$ form controller specs + */ +class $model;format="Camel"$ControllerSpec extends PlaySpec with GuiceOneAppPerTest with Injecting { + + // Provide stubs for components based off Helpers.stubControllerComponents() + class StubComponents(cc:ControllerComponents = stubControllerComponents()) extends MessagesControllerComponents { + override val parsers: PlayBodyParsers = cc.parsers + override val messagesApi: MessagesApi = cc.messagesApi + override val langs: Langs = cc.langs + override val fileMimeTypes: FileMimeTypes = cc.fileMimeTypes + override val executionContext: ExecutionContext = cc.executionContext + override val actionBuilder: ActionBuilder[Request, AnyContent] = cc.actionBuilder + override val messagesActionBuilder: MessagesActionBuilder = new DefaultMessagesActionBuilderImpl(parsers.default, messagesApi)(executionContext) + } + + "$model;format="Camel"$Controller GET" should { + + "render the index page from a new instance of controller" in { + val controller = new $model;format="Camel"$Controller(new StubComponents()) + val request = FakeRequest().withCSRFToken + val home = controller.$model;format="camel"$Get().apply(request) + + status(home) mustBe OK + contentType(home) mustBe Some("text/html") + } + + "render the index page from the application" in { + val controller = inject[$model;format="Camel"$Controller] + val request = FakeRequest().withCSRFToken + val home = controller.$model;format="camel"$Get().apply(request) + + status(home) mustBe OK + contentType(home) mustBe Some("text/html") + } + + "render the index page from the router" in { + val request = CSRFTokenHelper.addCSRFToken(FakeRequest(GET, "/$model;format="camel"$")) + val home = route(app, request).get + + status(home) mustBe OK + contentType(home) mustBe Some("text/html") + } + } + + "$model;format="Camel"$Controller POST" should { + "process form" in { + val request = { + FakeRequest(POST, "/$model;format="camel"$") + .withFormUrlEncodedBody("name" -> "play", "age" -> "4") + } + val home = route(app, request).get + + status(home) mustBe SEE_OTHER + } + } + +} diff --git a/buildpacks/buildpack-scala/tests/scala/.github/CODEOWNERS b/buildpacks/buildpack-scala/tests/scala/.github/CODEOWNERS new file mode 100644 index 000000000..42e86532e --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.github/CODEOWNERS @@ -0,0 +1,3 @@ +# Note: Delete this file if you are copying the code in this repository into your own project. + +* @heroku/languages diff --git a/buildpacks/buildpack-scala/tests/scala/.gitignore b/buildpacks/buildpack-scala/tests/scala/.gitignore new file mode 100644 index 000000000..dce730384 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/.gitignore @@ -0,0 +1,9 @@ +logs +target +/.bsp +/.idea +/.idea_modules +/.classpath +/.project +/.settings +/RUNNING_PID diff --git a/buildpacks/buildpack-scala/tests/scala/LICENSE b/buildpacks/buildpack-scala/tests/scala/LICENSE new file mode 100644 index 000000000..9f7552ba2 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2023 Salesforce, Inc. + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/buildpacks/buildpack-scala/tests/scala/Procfile b/buildpacks/buildpack-scala/tests/scala/Procfile index 1b9d9070c..5d5f434a3 100644 --- a/buildpacks/buildpack-scala/tests/scala/Procfile +++ b/buildpacks/buildpack-scala/tests/scala/Procfile @@ -1 +1 @@ -web: target/universal/stage/bin/hello +web: target/universal/stage/bin/scala-getting-started -Dhttp.port=${PORT} diff --git a/buildpacks/buildpack-scala/tests/scala/Procfile.windows b/buildpacks/buildpack-scala/tests/scala/Procfile.windows new file mode 100644 index 000000000..676de56a3 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/Procfile.windows @@ -0,0 +1 @@ +web: target\universal\stage\bin\scala-getting-started.bat -Dhttp.port=${PORT} diff --git a/buildpacks/buildpack-scala/tests/scala/README.md b/buildpacks/buildpack-scala/tests/scala/README.md new file mode 100644 index 000000000..20218e164 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/README.md @@ -0,0 +1,21 @@ +# Scala: Getting Started + +A barebones Scala app, which can easily be deployed to Heroku. + +## Deploying to Heroku + +Using resources for this example app counts towards your usage. [Delete your app](https://devcenter.heroku.com/articles/heroku-cli-commands#heroku-apps-destroy) and [database](https://devcenter.heroku.com/articles/heroku-postgresql#removing-the-add-on) as soon as you are done experimenting to control costs. + +By default, apps use Eco dynos if you are subscribed to Eco. Otherwise, it defaults to Basic dynos. The Eco dynos plan is shared across all Eco dynos in your account and is recommended if you plan on deploying many small apps to Heroku. Learn more about our low-cost plans [here](https://blog.heroku.com/new-low-cost-plans). + +Eligible students can apply for platform credits through our new [Heroku for GitHub Students program](https://blog.heroku.com/github-student-developer-program). + +This application supports the [Getting Started with Scala on Heroku](https://devcenter.heroku.com/articles/getting-started-with-scala) article - check it out for instructions on how to deploy this app to Heroku and also run it locally. + +Alternatively, you can deploy it using this Heroku Button: + +[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy) + +For more information about using Scala on Heroku, see these Dev Center articles: + +- [Scala on Heroku](https://devcenter.heroku.com/categories/scala) diff --git a/buildpacks/buildpack-scala/tests/scala/app.json b/buildpacks/buildpack-scala/tests/scala/app.json new file mode 100644 index 000000000..051c2ad09 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/app.json @@ -0,0 +1,5 @@ +{ + "name": "Start on Heroku: Scala", + "description": "A barebones Scala app, which can easily be deployed to Heroku.", + "addons": ["heroku-postgresql"] +} diff --git a/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala b/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala new file mode 100644 index 000000000..0fbccb45a --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala @@ -0,0 +1,33 @@ +package controllers + +import javax.inject._ +import play.api._ +import play.api.db.Database +import play.api.mvc._ + +@Singleton +class Application @Inject()(val controllerComponents: ControllerComponents, val database: Database) extends BaseController { + + def index(): Action[AnyContent] = Action { implicit request: Request[AnyContent] => + Ok(views.html.index()) + } + + def db(): Action[AnyContent] = Action { implicit request: Request[AnyContent] => + // In this getting started app, we don't use a custom execution context to keep the code and configuration simple. + // For real-world apps, consult the Play documentation on how to configure custom contexts and how to use them: + // https://www.playframework.com/documentation/2.8.19/AccessingAnSQLDatabase#Using-a-CustomExecutionContext + database.withConnection { connection => + val statement = connection.createStatement() + statement.executeUpdate("CREATE TABLE IF NOT EXISTS ticks (tick timestamp)") + statement.executeUpdate("INSERT INTO ticks VALUES (now())") + + val output = new StringBuilder(); + val resultSet = statement.executeQuery("SELECT tick FROM ticks") + while (resultSet.next()) { + output.append("Read from DB: " + resultSet.getTimestamp("tick") + "\n") + } + + Ok(output.toString()) + } + } +} diff --git a/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html b/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html new file mode 100644 index 000000000..20c0155a2 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html @@ -0,0 +1,91 @@ +@() + +@main { +
+
+ +

Getting Started with Scala on Heroku

+

This is a sample Scala application deployed to Heroku. It's a reasonably simple app - but a good foundation + for understanding how to get the most out of the Heroku platform.

+ Getting Started with Scala + Source on GitHub +
+
+ +
+ +
+
+
+

How this sample app works

+
    +
  • This app was deployed to Heroku, either using Git or by using Heroku Button on the repository. +
  • + +
  • When Heroku received the source code, it fetched all the dependencies in the build.sbt, creating a + slug. +
  • +
  • The platform then spins up a dyno, a lightweight container that provides an isolated environment in + which the slug can be mounted and executed. +
  • +
  • You can scale your app, manage it, and deploy over 150 add-on + services, from the Dashboard or CLI. +
  • +
+
+
+

Next Steps

+
    +
  • If you are following the Getting + Started guide, then please head back to the tutorial and follow the next steps! +
  • +
  • If you deployed this app by deploying the Heroku Button, then in a command line shell, run:
  • +
  • +
      +
    • git clone https://github.com/heroku/scala-getting-started.git - this will create + a + local copy of the source code for the app +
    • +
    • cd scala-getting-started - change directory into the local source code + repository +
    • +
    • heroku git:remote -a <your-app-name> - associate the Heroku app with the + repository +
    • +
    • You'll now be set up to run the app locally, or deploy + changes to Heroku +
    • +
    +
  • +
+

Helpful Links

+ +
+
+ + +
+} diff --git a/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html b/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html new file mode 100644 index 000000000..420777ce5 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html @@ -0,0 +1,70 @@ +@(content: Html) + + + + + Scala Getting Started on Heroku + + + + + + + + @content + + + + + + diff --git a/buildpacks/buildpack-scala/tests/scala/app/views/nav.scala.html b/buildpacks/buildpack-scala/tests/scala/app/views/nav.scala.html new file mode 100644 index 000000000..a0fa1b318 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/app/views/nav.scala.html @@ -0,0 +1,33 @@ + diff --git a/buildpacks/buildpack-scala/tests/scala/build.sbt b/buildpacks/buildpack-scala/tests/scala/build.sbt index ece22aba0..6f0bb02e0 100644 --- a/buildpacks/buildpack-scala/tests/scala/build.sbt +++ b/buildpacks/buildpack-scala/tests/scala/build.sbt @@ -1,15 +1,23 @@ -import NativePackagerKeys._ +name := """scala-getting-started""" +organization := "com.heroku" -packageArchetype.java_application +version := "1.0-SNAPSHOT" -name := "hello" +lazy val root = (project in file(".")).enablePlugins(PlayScala) -version := "1.0" - -scalaVersion := "2.10.4" - -mainClass in Compile := Some("Web") +scalaVersion := "2.13.10" +libraryDependencies += guice +libraryDependencies += jdbc +libraryDependencies += "org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test libraryDependencies ++= Seq( - "com.twitter" % "finagle-http_2.10" % "6.18.0" + "com.google.inject" % "guice" % "5.1.0", + "com.google.inject.extensions" % "guice-assistedinject" % "5.1.0", + "org.postgresql" % "postgresql" % "42.6.0" ) + +// Adds additional packages into Twirl +//TwirlKeys.templateImports += "com.heroku.controllers._" + +// Adds additional packages into conf/routes +// play.sbt.routes.RoutesKeys.routesImport += "com.heroku.binders._" diff --git a/buildpacks/buildpack-scala/tests/scala/build.sc b/buildpacks/buildpack-scala/tests/scala/build.sc new file mode 100644 index 000000000..b162845a5 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/build.sc @@ -0,0 +1,10 @@ +import mill._ +import $ivy.`com.lihaoyi::mill-contrib-playlib:`, mill.playlib._ + +object scalagettingstarted extends PlayModule with SingleModule { + + def scalaVersion = "2.13.10" + def playVersion = "2.8.19" + def twirlVersion = "1.5.1" + +} diff --git a/buildpacks/buildpack-scala/tests/scala/conf/application.conf b/buildpacks/buildpack-scala/tests/scala/conf/application.conf new file mode 100644 index 000000000..46b8ece08 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/conf/application.conf @@ -0,0 +1,23 @@ +# https://www.playframework.com/documentation/latest/Configuration + +# Allows all hosts to be valid hosts for requests to this app. This is necessary since this getting started guide +# makes users deploy their own app of which we don't know the hostname in advance. For production apps, set this +# to the correct host of your application. +# More info: https://www.playframework.com/documentation/2.8.x/AllowedHostsFilter +play.filters.hosts { + allowed = ["."] +} + +# Sets the secret key if the APPLICATION_SECRET environment variable isn't set. It is recommended to set the +# application secret for production apps via heroku config:set on the command line. +# More info: https://www.playframework.com/documentation/2.8.x/ApplicationSecret +play.http.secret.key = "YWRmNTNmZDYtMTE5NS00MTc1LWI4YmMtMGU3ZmY2NTE1NDI0Cg==" +play.http.secret.key = ${?APPLICATION_SECRET} + +# Default to "jdbc:postgresql://example.com:5432/database" so that the application at least starts up when +# JDBC_DATABASE_URL is not set. We use this here to reduce friction when newcomers work with this getting started +# application. Production applications should not have a default like this, especially not ones that have credentials +# in them! +db.default.url = "jdbc:postgresql://example.com:5432/database" +db.default.url = ${?JDBC_DATABASE_URL} +db.default.driver = org.postgresql.Driver diff --git a/buildpacks/buildpack-scala/tests/scala/conf/logback.xml b/buildpacks/buildpack-scala/tests/scala/conf/logback.xml new file mode 100644 index 000000000..a73d2016e --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/conf/logback.xml @@ -0,0 +1,40 @@ + + + + + ${application.home:-.}/logs/application.log + + UTF-8 + + %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{akkaSource}) %msg%n + + + + + + true + + UTF-8 + + %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %cyan(%logger{36}) %magenta(%X{akkaSource}) %msg%n + + + + + + + + + + + + + + + + + + + + + diff --git a/buildpacks/buildpack-scala/tests/scala/conf/messages b/buildpacks/buildpack-scala/tests/scala/conf/messages new file mode 100644 index 000000000..0226738a6 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/conf/messages @@ -0,0 +1 @@ +# https://www.playframework.com/documentation/latest/ScalaI18N diff --git a/buildpacks/buildpack-scala/tests/scala/conf/routes b/buildpacks/buildpack-scala/tests/scala/conf/routes new file mode 100644 index 000000000..b22a4d517 --- /dev/null +++ b/buildpacks/buildpack-scala/tests/scala/conf/routes @@ -0,0 +1,10 @@ +# Routes +# This file defines all application routes (Higher priority routes first) +# https://www.playframework.com/documentation/latest/ScalaRouting +# ~~~~ + +GET / controllers.Application.index() +GET /database controllers.Application.db() + +# Map static resources from the /public folder to the /assets URL path +GET /assets/*file controllers.Assets.versioned(path="/public", file: Asset) diff --git a/buildpacks/buildpack-scala/tests/scala/project/build.properties b/buildpacks/buildpack-scala/tests/scala/project/build.properties index 78dfece3a..563a014da 100644 --- a/buildpacks/buildpack-scala/tests/scala/project/build.properties +++ b/buildpacks/buildpack-scala/tests/scala/project/build.properties @@ -1,4 +1 @@ -#Activator-generated Properties -#Wed Aug 13 09:36:12 CDT 2014 -template.uuid=a855816c-0367-44ba-9adb-6a903f6ad599 -sbt.version=1.9.9 +sbt.version=1.7.2 diff --git a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt index 403414696..8846622ec 100644 --- a/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt +++ b/buildpacks/buildpack-scala/tests/scala/project/plugins.sbt @@ -1,13 +1,2 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -// The Typesafe repository -resolvers += "Typesafe Releases Repository" at "https://repo.typesafe.com/typesafe/releases/" - -// The Maven repository -resolvers += "Maven Central Server" at "https://repo1.maven.org/maven2" - -// The "public" repository -resolvers += "public" at "https://repo1.maven.org/maven2" - -addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.19") +addSbtPlugin("org.foundweekends.giter8" % "sbt-giter8-scaffold" % "0.13.1") diff --git a/buildpacks/buildpack-scala/tests/scala/public/images/favicon.png b/buildpacks/buildpack-scala/tests/scala/public/images/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..c7d92d2ae47434d9a61c90bc205e099b673b9dd5 GIT binary patch literal 687 zcmV;g0#N;lP)ezT{T_ZJ?}AL z5NC{NW(ESID=>(O3&Eg8 zmA9J&6c`h4_f6L;=bU>_H8aNG`kfvCj9zomNt)?O;rzWqZs0LEt%1WB218%1fo9uB zsW^yhBR7C(mqN%GEK9&msg0~ zWY?#bf4q8G-~2KttQZ($odJvy&_-~f?9*ThK@fwR$U^1)p*8=_+^3BXx0$i1BC8XC zr21u6D5nVK&^!dOAw&|1E;qC3uFNj3*Jj#&%Oje@0D-nhfmM*o%^5f}-pxQ07(95H z3|LoV>V19w#rLgmRmtVy9!T3M3FUE3><0T8&b3yEsWcLW`0(=1+qsqc(k(ymBLK0h zK!6(6$7MX~M`-QA2$wk7n(7hhkJ}4Rwi-Vd(_ZFX1Yk7TXuB0IJYpo@kLb2G8m)E{ z`9v=!hi}fOytKckfN^C@6+Z*+MVI9-W_p@_3yyR#UYc0FTpD}i#k>c!wYCS)4v@E$ zchZCo=zV@)`v^$;V18ixdjFMY#q^2$wEX%{f(XD8POnsn$bpbClpC@hPxjzyO>pY|*pF3UU2tYcCN?rUk{Sskej70Mmu9vPwMYhO1m{AxAt(zqDT|0jP7FaX=6 V`?~}E4H^Id002ovPDHLkV1hC)G==~G literal 0 HcmV?d00001 diff --git a/buildpacks/buildpack-scala/tests/scala/public/images/lang-logo.png b/buildpacks/buildpack-scala/tests/scala/public/images/lang-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..79c9ce691062d361832974e478e026eb2ab95c26 GIT binary patch literal 1097 zcmV-P1h)H$P)NC+!Xw&L2KA=7}3BKuMAgdq2_^CTyv2-DK%-4rdHk3iU~o4)<>IMJCV73Tysv zh3g)u=NntOoWc#}{-JQ)ZvYZ6t>pzkIvD&$>AC=Nqn0g$m-diefjnfiTx~g3J@DEu zq24R@K_)Ol-7x3hr8>7er5Y#ew70#n?!<+hL<)RjGe06iuGfg8Vc4p!=M3o75yp%X zo$mDvr23CnH2286GzMpsaNDU@Ai-=WpG;;0D@HGrcn`2gAi>0+FL+99gqYYR?+r-s zh_?%WAF{XHy8izn+`^5@sNS#qTy-Oi(#n_g0_5+EN=iF2wyo3)kV>%nZo^2H-g*Y| zSw_{h@SBstCka^xaw((gTKMfPeqqZ%zRIX#Rg&TJhE{=Gn^DEo8m1pAU=fH`M)gV# zjz?SU_HH|xctQVmd`;CFo+6}cMs;dMS)&gxFsuQQ$f&k04{B-+H!v&#k;!D1+zqTCLP$V9Y2Z4H8dg*EF{zyskn_tBx>c zl;K-;QUVESYV3KA1>u!PDw; Date: Sun, 31 Mar 2024 02:55:52 -0400 Subject: [PATCH 452/871] fix: respond only with the test app name --- .../tests/scala/app/views/index.scala.html | 89 +------------------ .../tests/scala/app/views/main.scala.html | 70 +-------------- 2 files changed, 2 insertions(+), 157 deletions(-) diff --git a/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html b/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html index 20c0155a2..15a31da56 100644 --- a/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html +++ b/buildpacks/buildpack-scala/tests/scala/app/views/index.scala.html @@ -1,91 +1,4 @@ @() - @main { -
-
- -

Getting Started with Scala on Heroku

-

This is a sample Scala application deployed to Heroku. It's a reasonably simple app - but a good foundation - for understanding how to get the most out of the Heroku platform.

- Getting Started with Scala - Source on GitHub -
-
- -
- -
-
-
-

How this sample app works

-
    -
  • This app was deployed to Heroku, either using Git or by using Heroku Button on the repository. -
  • - -
  • When Heroku received the source code, it fetched all the dependencies in the build.sbt, creating a - slug. -
  • -
  • The platform then spins up a dyno, a lightweight container that provides an isolated environment in - which the slug can be mounted and executed. -
  • -
  • You can scale your app, manage it, and deploy over 150 add-on - services, from the Dashboard or CLI. -
  • -
-
-
-

Next Steps

-
    -
  • If you are following the Getting - Started guide, then please head back to the tutorial and follow the next steps! -
  • -
  • If you deployed this app by deploying the Heroku Button, then in a command line shell, run:
  • -
  • -
      -
    • git clone https://github.com/heroku/scala-getting-started.git - this will create - a - local copy of the source code for the app -
    • -
    • cd scala-getting-started - change directory into the local source code - repository -
    • -
    • heroku git:remote -a <your-app-name> - associate the Heroku app with the - repository -
    • -
    • You'll now be set up to run the app locally, or deploy - changes to Heroku -
    • -
    -
  • -
-

Helpful Links

- -
-
- - -
+ scala } diff --git a/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html b/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html index 420777ce5..eed7fff5e 100644 --- a/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html +++ b/buildpacks/buildpack-scala/tests/scala/app/views/main.scala.html @@ -1,70 +1,2 @@ @(content: Html) - - - - - Scala Getting Started on Heroku - - - - - - - - @content - - - - - - +@content From e55b84a8a28347cbb95daf406c25924ee3947249 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 03:28:07 -0400 Subject: [PATCH 453/871] fix: respond only with the test app name --- .../tests/scala/app/controllers/Application.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala b/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala index 0fbccb45a..e93edcc72 100644 --- a/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala +++ b/buildpacks/buildpack-scala/tests/scala/app/controllers/Application.scala @@ -9,7 +9,7 @@ import play.api.mvc._ class Application @Inject()(val controllerComponents: ControllerComponents, val database: Database) extends BaseController { def index(): Action[AnyContent] = Action { implicit request: Request[AnyContent] => - Ok(views.html.index()) + Ok("scala") } def db(): Action[AnyContent] = Action { implicit request: Request[AnyContent] => From 63fbee3a266a36a33853e6c3f9ca5195036471ff Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 05:19:22 -0400 Subject: [PATCH 454/871] feat: use system bash to avoid extracting bash at runtime When herokuish executes, it extracts a bash binary into the HOME directory - /app - and then executes as normal. This makes it impossible to run read-only containers, as that extraction happens at both build time (when executing buildpacks) as well as runtime (when running applications). Rather than attempt to move the bash binary to /tmp, we instead use system bash. While this is a downgrade of bash since we packaged a newer bash, this provides better compatibility with upstream Heroku, which executes shell buildpacks with system bash. --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index 3d161ec55..36eab300d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,3 +53,4 @@ RUN /bin/herokuish buildpack install \ */tmp COPY include/default_user.bash /tmp/default_user.bash RUN bash /tmp/default_user.bash && rm -f /tmp/default_user.bash +ENV BASH_BIN /usr/bin/bash From 6c4388c487050fd90b1087676e85a22897e61fa8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 05:53:45 -0400 Subject: [PATCH 455/871] Release 0.9.0 - #1177 @dependabot: Update php to version v248 - #1178 @josegonzalez: chore: update dependencies in scala test app - #1179 @josegonzalez: feat: use system bash to avoid extracting bash at runtime --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9db71066c..3316f5ac1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [0.9.0](https://github.com/gliderlabs/herokuish/compare/v0.8.0...v0.9.0) - 2024-03-31 + +- #1177 @dependabot: Update php to version v248 +- #1178 @josegonzalez: chore: update dependencies in scala test app +- #1179 @josegonzalez: feat: use system bash to avoid extracting bash at runtime + ## [0.8.0](https://github.com/gliderlabs/herokuish/compare/v0.7.6...v0.8.0) - 2024-03-28 - #1093 @dependabot: chore(deps): bump actions/download-artifact from 3 to 4 diff --git a/Makefile b/Makefile index 6cd461c82..02aa3c3c0 100644 --- 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.8.0 +VERSION ?= 0.9.0 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index bd41b2cdd..4ca951521 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.8.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.9.0-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.8.0/herokuish_0.8.0_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.0/herokuish_0.9.0_linux_x86_64.tgz \ | tar -xzC /bin ``` From 4fed80e94748ff1b2e9cb70bc5fa37a0a51ad26e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 22:05:04 -0400 Subject: [PATCH 456/871] fix: do not unnecessarily create/change files when starting a process In order to properly support readonly containers, we need to avoid taking any action that might create files or change permissions within the app path on container start. --- include/procfile.bash | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/include/procfile.bash b/include/procfile.bash index c53270c2a..319d7f731 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -102,13 +102,14 @@ procfile-load-profile() { # shellcheck disable=SC1090 source "$file" done - mkdir -p "$app_path/.profile.d" - # shellcheck disable=SC2154 - chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" - for file in "$app_path/.profile.d"/*.sh; do - # shellcheck disable=SC1090 - source "$file" - done + if [[ -d "$app_path/.profile.d" ]]; then + # shellcheck disable=SC2154 + chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" + for file in "$app_path/.profile.d"/*.sh; do + # shellcheck disable=SC1090 + source "$file" + done + fi if [[ -s "$app_path/.profile" ]]; then # shellcheck disable=SC1090 source "$app_path/.profile" @@ -122,8 +123,8 @@ procfile-setup-home() { # shellcheck disable=SC2154 usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 # shellcheck disable=SC2154 - chown "$unprivileged_user:$unprivileged_group" "$app_path" if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then + chown "$unprivileged_user:$unprivileged_group" "$app_path" # unprivileged_user & unprivileged_group are defined in outer scope # shellcheck disable=SC2154 find "$app_path" \( \! -user "$unprivileged_user" -o \! -group "$unprivileged_group" \) -print0 | xargs -0 -r chown "$unprivileged_user:$unprivileged_group" From 593f9f2c1103911fb96ade0f0577f20f891bb93b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 23:43:53 -0400 Subject: [PATCH 457/871] fix: create the profile.d directory during the build process Rather than try and depend on it existing later, ensure it exists when we first build the app. --- include/buildpack.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/include/buildpack.bash b/include/buildpack.bash index fd7c29bb0..6909349a7 100644 --- a/include/buildpack.bash +++ b/include/buildpack.bash @@ -204,6 +204,7 @@ buildpack-execute() { fi if [[ -f "$build_path/.release" ]]; then config_vars="$(cat "$build_path/.release" | yaml-get config_vars)" + unprivileged mkdir -p "$build_path/.profile.d" unprivileged touch "$build_path/.profile.d/00_config_vars.sh" if [[ "$config_vars" ]]; then mkdir -p "$build_path/.profile.d" From 61febc68a3a1f7a439178400d12cc8cf08be9094 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 31 Mar 2024 23:45:16 -0400 Subject: [PATCH 458/871] fix: invert disable-chown check The check was incorrectly performed, causing us to perform the process-start chown whenever the variable was set. This inverts that check and also wraps another chown command that occurred on process start. --- include/procfile.bash | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/include/procfile.bash b/include/procfile.bash index 319d7f731..38478dc48 100644 --- a/include/procfile.bash +++ b/include/procfile.bash @@ -104,7 +104,9 @@ procfile-load-profile() { done if [[ -d "$app_path/.profile.d" ]]; then # shellcheck disable=SC2154 - chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" + if [[ "$HEROKUISH_DISABLE_CHOWN" != "true" ]]; then + chown "$unprivileged_user:$unprivileged_group" "$app_path/.profile.d" + fi for file in "$app_path/.profile.d"/*.sh; do # shellcheck disable=SC1090 source "$file" @@ -123,7 +125,7 @@ procfile-setup-home() { # shellcheck disable=SC2154 usermod --home "$app_path" "$unprivileged_user" >/dev/null 2>&1 # shellcheck disable=SC2154 - if [[ "$HEROKUISH_DISABLE_CHOWN" == "true" ]]; then + if [[ "$HEROKUISH_DISABLE_CHOWN" != "true" ]]; then chown "$unprivileged_user:$unprivileged_group" "$app_path" # unprivileged_user & unprivileged_group are defined in outer scope # shellcheck disable=SC2154 From 9823d06c5b9294858d3e82eb7625db633aadecf6 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 1 Apr 2024 15:39:11 -0400 Subject: [PATCH 459/871] Release 0.9.1 - #1181 @josegonzalez: fix: do not unnecessarily create/change files when starting a process - #1182 @josegonzalez: fix: invert disable-chown check - #1183 @josegonzalez: fix: create the profile.d directory during the build process --- CHANGELOG.md | 6 ++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3316f5ac1..745bbff92 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All notable changes to this project will be documented in this file. +## [0.9.1](https://github.com/gliderlabs/herokuish/compare/v0.9.0...v0.9.1) - 2024-04-01 + +- #1181 @josegonzalez: fix: do not unnecessarily create/change files when starting a process +- #1182 @josegonzalez: fix: invert disable-chown check +- #1183 @josegonzalez: fix: create the profile.d directory during the build process + ## [0.9.0](https://github.com/gliderlabs/herokuish/compare/v0.8.0...v0.9.0) - 2024-03-31 - #1177 @dependabot: Update php to version v248 diff --git a/Makefile b/Makefile index 02aa3c3c0..b289ec0ae 100644 --- 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.9.0 +VERSION ?= 0.9.1 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 4ca951521..24190069c 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.9.0-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.9.1-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.9.0/herokuish_0.9.0_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.1/herokuish_0.9.1_linux_x86_64.tgz \ | tar -xzC /bin ``` From 6553356279d0b51d20c17e422e4aa81397357fd1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Apr 2024 11:57:43 +0000 Subject: [PATCH 460/871] chore(deps): bump rake in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rake](https://github.com/ruby/rake) from 13.1.0 to 13.2.0. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.1.0...v13.2.0) --- updated-dependencies: - dependency-name: rake dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 16af5eab9..46d753031 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -14,7 +14,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) - rake (13.1.0) + rake (13.2.0) ruby2_keywords (0.0.5) sinatra (3.2.0) mustermann (~> 3.0) From 27319ad6a06dd169f493206e3fcb3bb6f7214c52 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 4 Apr 2024 13:38:30 +0000 Subject: [PATCH 461/871] Update nodejs to version v241 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 8c9e1ccb4..b65bf3e4f 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v240 +v241 From cd0e167086f955f5477852a435c37414851e1d0c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:39:23 +0000 Subject: [PATCH 462/871] chore(deps): bump rake in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rake](https://github.com/ruby/rake) from 13.2.0 to 13.2.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.2.0...v13.2.1) --- updated-dependencies: - dependency-name: rake dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 46d753031..dec5d0d31 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -14,7 +14,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-test (2.1.0) rack (>= 1.3) - rake (13.2.0) + rake (13.2.1) ruby2_keywords (0.0.5) sinatra (3.2.0) mustermann (~> 3.0) From d5746ca4a00b95a83902d9bb8e2698f72a11977f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 6 Apr 2024 13:38:13 +0000 Subject: [PATCH 463/871] Update go to version v190 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 306e236c7..90fdf2912 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v189 +v190 From 10a7d6f35b6d3ec210c53bc5b92c2227c7b69ba0 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 10 Apr 2024 13:38:23 +0000 Subject: [PATCH 464/871] Update python to version v248 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 425584232..bb895b71d 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v246 +v248 From e56c423be174843a4b6530ae2593f410b3cd5f23 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 11 Apr 2024 13:38:24 +0000 Subject: [PATCH 465/871] Update nodejs to version v243 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index b65bf3e4f..6b1dadddb 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v241 +v243 From 809370a00a67d819be74c0da104f0a05a49c6e0f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 13 Apr 2024 13:38:22 +0000 Subject: [PATCH 466/871] Update php to version v249 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index bb895b71d..8717b0002 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v248 +v249 From 01036935ac2c75adb94ff8a8b833a95ce1f45c3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 11:25:54 +0000 Subject: [PATCH 467/871] chore(deps): bump monolog/monolog in /buildpacks/buildpack-php/tests/php Bumps [monolog/monolog](https://github.com/Seldaek/monolog) from 2.9.2 to 2.9.3. - [Release notes](https://github.com/Seldaek/monolog/releases) - [Changelog](https://github.com/Seldaek/monolog/blob/main/CHANGELOG.md) - [Commits](https://github.com/Seldaek/monolog/compare/2.9.2...2.9.3) --- updated-dependencies: - dependency-name: monolog/monolog dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 901fe3ea9..8fb15c7c8 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "monolog/monolog", - "version": "2.9.2", + "version": "2.9.3", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f" + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", - "reference": "437cb3628f4cf6042cc10ae97fc2b8472e48ca1f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/a30bfe2e142720dfa990d0a7e573997f5d884215", + "reference": "a30bfe2e142720dfa990d0a7e573997f5d884215", "shasum": "" }, "require": { @@ -38,8 +38,8 @@ "mongodb/mongodb": "^1.8", "php-amqplib/php-amqplib": "~2.4 || ^3", "phpspec/prophecy": "^1.15", - "phpstan/phpstan": "^0.12.91", - "phpunit/phpunit": "^8.5.14", + "phpstan/phpstan": "^1.10", + "phpunit/phpunit": "^8.5.38 || ^9.6.19", "predis/predis": "^1.1 || ^2.0", "rollbar/rollbar": "^1.3 || ^2 || ^3", "ruflin/elastica": "^7", @@ -94,7 +94,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/2.9.2" + "source": "https://github.com/Seldaek/monolog/tree/2.9.3" }, "funding": [ { @@ -106,7 +106,7 @@ "type": "tidelift" } ], - "time": "2023-10-27T15:25:26+00:00" + "time": "2024-04-12T20:52:51+00:00" }, { "name": "pimple/pimple", From 9c967ffd2abd0ce2d475277fb8ef7f3f6b2bda3b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:34:48 +0000 Subject: [PATCH 468/871] chore(deps): bump flask Bumps [flask](https://github.com/pallets/flask) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index efa92fe93..ba92cc6a8 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.2 +Flask==3.0.3 Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.5 From 9cbf4bc4a6acb5bbfdd8c2aba26ca6c57d49d8e0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 16 Apr 2024 01:35:00 +0000 Subject: [PATCH 469/871] chore(deps): bump flask in /buildpacks/buildpack-multi/tests/multi Bumps [flask](https://github.com/pallets/flask) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/pallets/flask/releases) - [Changelog](https://github.com/pallets/flask/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/flask/compare/3.0.2...3.0.3) --- updated-dependencies: - dependency-name: flask dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index efa92fe93..ba92cc6a8 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ -Flask==3.0.2 +Flask==3.0.3 Jinja2==3.1.3 gunicorn==21.2.0 markupsafe==2.1.5 From e56e6be6093a0099ea1a794d75d29a029fd1c75e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:26:05 +0000 Subject: [PATCH 470/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 21.2.0 to 22.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/21.2.0...22.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index efa92fe93..1a3cca6a1 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.2 Jinja2==3.1.3 -gunicorn==21.2.0 +gunicorn==22.0.0 markupsafe==2.1.5 From 5bd60bdf16018e2ef1ad35da44cc2e2c9baba028 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 02:26:31 +0000 Subject: [PATCH 471/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 21.2.0 to 22.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/21.2.0...22.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index ce186ac73..8120518cd 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ Django==2.2.28 -gunicorn==21.2.0 +gunicorn==22.0.0 From bcdf6457e7e9d2657e13799d8963b390fc953753 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 11:51:56 +0000 Subject: [PATCH 472/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.8.0 to 3.9.1. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.8.0...v3.9.1) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 78 +++++++++---------- 1 file changed, 38 insertions(+), 40 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 8fb15c7c8..6c9a87d3b 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -426,16 +426,16 @@ }, { "name": "symfony/deprecation-contracts", - "version": "v2.5.2", + "version": "v2.5.3", "source": { "type": "git", "url": "https://github.com/symfony/deprecation-contracts.git", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66" + "reference": "80d075412b557d41002320b96a096ca65aa2c98d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66", - "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66", + "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/80d075412b557d41002320b96a096ca65aa2c98d", + "reference": "80d075412b557d41002320b96a096ca65aa2c98d", "shasum": "" }, "require": { @@ -473,7 +473,7 @@ "description": "A generic function and convention to trigger deprecation notices", "homepage": "https://symfony.com", "support": { - "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.2" + "source": "https://github.com/symfony/deprecation-contracts/tree/v2.5.3" }, "funding": [ { @@ -489,7 +489,7 @@ "type": "tidelift" } ], - "time": "2022-01-02T09:53:40+00:00" + "time": "2023-01-24T14:02:46+00:00" }, { "name": "symfony/error-handler", @@ -1058,16 +1058,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", - "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", + "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", "shasum": "" }, "require": { @@ -1081,9 +1081,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1120,7 +1117,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" }, "funding": [ { @@ -1136,7 +1133,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -1311,16 +1308,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "42292d99c55abe617799667f454222c54c60e229" + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", - "reference": "42292d99c55abe617799667f454222c54c60e229", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", "shasum": "" }, "require": { @@ -1334,9 +1331,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1374,7 +1368,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" }, "funding": [ { @@ -1390,7 +1384,7 @@ "type": "tidelift" } ], - "time": "2023-07-28T09:04:16+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/polyfill-php72", @@ -1549,16 +1543,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.28.0", + "version": "v1.29.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5" + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/6caa57379c4aec19c0a12a38b59b26487dcfe4b5", - "reference": "6caa57379c4aec19c0a12a38b59b26487dcfe4b5", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", "shasum": "" }, "require": { @@ -1566,9 +1560,6 @@ }, "type": "library", "extra": { - "branch-alias": { - "dev-main": "1.28-dev" - }, "thanks": { "name": "symfony/polyfill", "url": "https://github.com/symfony/polyfill" @@ -1612,7 +1603,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" }, "funding": [ { @@ -1628,7 +1619,7 @@ "type": "tidelift" } ], - "time": "2023-01-26T09:26:14+00:00" + "time": "2024-01-29T20:11:03+00:00" }, { "name": "symfony/routing", @@ -2008,30 +1999,37 @@ }, { "name": "twig/twig", - "version": "v3.8.0", + "version": "v3.9.1", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d" + "reference": "664647f46bf68a98cf5af27b42de8017a3e2d878" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", - "reference": "9d15f0ac07f44dc4217883ec6ae02fd555c6f71d", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/664647f46bf68a98cf5af27b42de8017a3e2d878", + "reference": "664647f46bf68a98cf5af27b42de8017a3e2d878", "shasum": "" }, "require": { "php": ">=7.2.5", + "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", "symfony/polyfill-php80": "^1.22" }, "require-dev": { "psr/container": "^1.0|^2.0", - "symfony/phpunit-bridge": "^5.4.9|^6.3|^7.0" + "symfony/phpunit-bridge": "^5.4.9|^6.4|^7.0" }, "type": "library", "autoload": { + "files": [ + "src/Resources/core.php", + "src/Resources/debug.php", + "src/Resources/escaper.php", + "src/Resources/string_loader.php" + ], "psr-4": { "Twig\\": "src/" } @@ -2064,7 +2062,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.8.0" + "source": "https://github.com/twigphp/Twig/tree/v3.9.1" }, "funding": [ { @@ -2076,7 +2074,7 @@ "type": "tidelift" } ], - "time": "2023-11-21T18:54:41+00:00" + "time": "2024-04-17T09:00:00+00:00" } ], "packages-dev": [ From 610866e7b1f89f59daeda578fae844e35d2379ca Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 17:36:19 +0000 Subject: [PATCH 473/871] chore(deps): bump gunicorn in /buildpacks/buildpack-multi/tests/multi Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 21.2.0 to 22.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/21.2.0...22.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index ba92cc6a8..b42189f5a 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 Jinja2==3.1.3 -gunicorn==21.2.0 +gunicorn==22.0.0 markupsafe==2.1.5 From c98f2809e1a23fc4e5dbe3256f8a7695d478de44 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 11:03:21 +0000 Subject: [PATCH 474/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.9.1 to 3.9.2. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.9.1...v3.9.2) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 6c9a87d3b..388bfbe55 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1999,16 +1999,16 @@ }, { "name": "twig/twig", - "version": "v3.9.1", + "version": "v3.9.2", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "664647f46bf68a98cf5af27b42de8017a3e2d878" + "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/664647f46bf68a98cf5af27b42de8017a3e2d878", - "reference": "664647f46bf68a98cf5af27b42de8017a3e2d878", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3", + "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3", "shasum": "" }, "require": { @@ -2062,7 +2062,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.1" + "source": "https://github.com/twigphp/Twig/tree/v3.9.2" }, "funding": [ { @@ -2074,7 +2074,7 @@ "type": "tidelift" } ], - "time": "2024-04-17T09:00:00+00:00" + "time": "2024-04-17T14:16:25+00:00" } ], "packages-dev": [ From 55eaa0ce298a8eb36a74d89b4446d703af4c55ae Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 18 Apr 2024 13:38:12 +0000 Subject: [PATCH 475/871] Update ruby to version v268 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index cc71c451b..37f25b319 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v267 +v268 From df7e320ded0682fcab242b829eb6832e44f7cb1b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:49:29 +0000 Subject: [PATCH 476/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.9.2 to 3.9.3. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.9.2...v3.9.3) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 388bfbe55..9d6b6efe1 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1999,16 +1999,16 @@ }, { "name": "twig/twig", - "version": "v3.9.2", + "version": "v3.9.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3" + "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3", - "reference": "856cb5a6cfd6f3e4dc1f6c9a8f54e259503f7cf3", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", "shasum": "" }, "require": { @@ -2062,7 +2062,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.2" + "source": "https://github.com/twigphp/Twig/tree/v3.9.3" }, "funding": [ { @@ -2074,7 +2074,7 @@ "type": "tidelift" } ], - "time": "2024-04-17T14:16:25+00:00" + "time": "2024-04-18T11:59:33+00:00" } ], "packages-dev": [ From 0af82aa3a66faa7fbe4da2ca4f9bdfb19b924037 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:49:33 +0000 Subject: [PATCH 477/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 231 to 249. - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v231...v249) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 388bfbe55..27a3c17e3 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2080,16 +2080,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v231", + "version": "v249", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "5c628e7e989e9d96d742bea67f3245bebe5fc7be" + "reference": "79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/5c628e7e989e9d96d742bea67f3245bebe5fc7be", - "reference": "5c628e7e989e9d96d742bea67f3245bebe5fc7be", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd", + "reference": "79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd", "shasum": "" }, "bin": [ @@ -2119,9 +2119,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v231" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v249" }, - "time": "2023-02-14T21:03:27+00:00" + "time": "2024-04-12T17:45:29+00:00" } ], "aliases": [], From e54d54c1e9ca64f2a2993127fe52a7323eafb9c4 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 19 Apr 2024 13:38:19 +0000 Subject: [PATCH 478/871] Update python to version v249 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index bb895b71d..8717b0002 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v248 +v249 From 4a2964de320056616b9cab5630acc22ed571258a Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 23 Apr 2024 14:51:46 +0000 Subject: [PATCH 479/871] Update ruby to version v269 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 37f25b319..d9fa12975 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v268 +v269 From 7188a0fd924ba225afe46d4cb048fb02f140a011 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 23 Apr 2024 19:23:48 +0000 Subject: [PATCH 480/871] Update ruby to version v270 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index d9fa12975..92080c51c 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v269 +v270 From 83b65bb6477201201ae03210cb92639b7d490dcb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 26 Apr 2024 13:38:17 +0000 Subject: [PATCH 481/871] Update nodejs to version v244 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 6b1dadddb..1e48f7666 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v243 +v244 From d64201168ad175e5143bf975e306850012f6bbba Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 26 Apr 2024 13:38:20 +0000 Subject: [PATCH 482/871] Update python to version v250 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 8717b0002..f7d62f0b3 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v249 +v250 From d2a15ec352a786254402eb6ac42bc159e2b2ae37 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 30 Apr 2024 13:38:10 +0000 Subject: [PATCH 483/871] Update nodejs to version v245 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 1e48f7666..4eb4e4f09 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v244 +v245 From 00f528aca8955c5afee78e7148665601e89a7d49 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 4 May 2024 13:38:08 +0000 Subject: [PATCH 484/871] Update nodejs to version v247 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 4eb4e4f09..d0a08b740 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v245 +v247 From dbd50fc90d609e25756a3d6a08db6c53f1cba67b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 11:06:06 +0000 Subject: [PATCH 485/871] chore(deps): bump jinja2 Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index b42189f5a..4c8df95ed 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 -Jinja2==3.1.3 +Jinja2==3.1.4 gunicorn==22.0.0 markupsafe==2.1.5 From 39582fc1c9a5df6fa290a8dbe13307f3ee00b760 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 6 May 2024 11:47:11 +0000 Subject: [PATCH 486/871] chore(deps): bump jinja2 in /buildpacks/buildpack-multi/tests/multi Bumps [jinja2](https://github.com/pallets/jinja) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](https://github.com/pallets/jinja/compare/3.1.3...3.1.4) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index b42189f5a..4c8df95ed 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 -Jinja2==3.1.3 +Jinja2==3.1.4 gunicorn==22.0.0 markupsafe==2.1.5 From 5ed2dce4702b0f8f034624508cf51a3c8b89e05c Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 8 May 2024 13:38:18 +0000 Subject: [PATCH 487/871] Update go to version v191 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 90fdf2912..ecd0e7fb3 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v190 +v191 From a0b05df31da282afb143d18c0f93610b677bee0e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 11:38:42 +0000 Subject: [PATCH 488/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.10 to 3.0.11. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/commits) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index d50e4fb9b..47aade7f5 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.10) + rack (3.0.11) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 5f65980e202428696c03434c337ff6c4e0d21b70 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 May 2024 11:51:11 +0000 Subject: [PATCH 489/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.9.3 to 3.10.3. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.9.3...v3.10.3) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index fc8c67c4a..194dba448 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1999,16 +1999,16 @@ }, { "name": "twig/twig", - "version": "v3.9.3", + "version": "v3.10.3", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58" + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", - "reference": "a842d75fed59cdbcbd3a3ad7fb9eb768fc350d58", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", + "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", "shasum": "" }, "require": { @@ -2062,7 +2062,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.9.3" + "source": "https://github.com/twigphp/Twig/tree/v3.10.3" }, "funding": [ { @@ -2074,7 +2074,7 @@ "type": "tidelift" } ], - "time": "2024-04-18T11:59:33+00:00" + "time": "2024-05-16T10:04:27+00:00" } ], "packages-dev": [ From 96f3c218147cdbd28a90a040eb2c7a0d3756252b Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 17 May 2024 13:38:08 +0000 Subject: [PATCH 490/871] Update nodejs to version v250 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index d0a08b740..f7d62f0b3 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v247 +v250 From ce5b28f5064eaef6fcfe171d256b3d2dfaca1e64 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 10 May 2024 11:51:05 +0000 Subject: [PATCH 491/871] chore(deps): bump sinatra and rack Bumps [sinatra](https://github.com/sinatra/sinatra) and [rack](https://github.com/rack/rack). These dependencies needed to be updated together. Updates `sinatra` from 3.2.0 to 4.0.0 - [Changelog](https://github.com/sinatra/sinatra/blob/main/CHANGELOG.md) - [Commits](https://github.com/sinatra/sinatra/compare/v3.2.0...v4.0.0) Updates `rack` from 2.2.9 to 3.0.11 - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/commits) --- updated-dependencies: - dependency-name: sinatra dependency-type: direct:production update-type: version-update:semver-major - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../tests/ruby-sinatra/Gemfile.lock | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index dec5d0d31..892e10512 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,18 +8,21 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (2.2.9) - rack-protection (3.2.0) + rack (3.0.11) + rack-protection (4.0.0) base64 (>= 0.1.0) - rack (~> 2.2, >= 2.2.4) + rack (>= 3.0.0, < 4) + rack-session (2.0.0) + rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) rake (13.2.1) ruby2_keywords (0.0.5) - sinatra (3.2.0) + sinatra (4.0.0) mustermann (~> 3.0) - rack (~> 2.2, >= 2.2.4) - rack-protection (= 3.2.0) + rack (>= 3.0.0, < 4) + rack-protection (= 4.0.0) + rack-session (>= 2.0.0, < 3) tilt (~> 2.0) test-unit (3.6.2) power_assert From 3e001064a4ce77db9efc6927429097f8cca3f3d8 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 18 May 2024 03:33:15 -0400 Subject: [PATCH 492/871] chore: add missing rackup dependency --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile | 1 + buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile index 71b30423b..5b1f41e80 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile @@ -4,6 +4,7 @@ gem 'sinatra' gem 'puma' gem 'rack' gem 'rake' +gem 'rackup' group :test do gem 'rack-test' diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 892e10512..cbf775ecf 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -16,6 +16,9 @@ GEM rack (>= 3.0.0) rack-test (2.1.0) rack (>= 1.3) + rackup (2.1.0) + rack (>= 3) + webrick (~> 1.8) rake (13.2.1) ruby2_keywords (0.0.5) sinatra (4.0.0) @@ -27,6 +30,7 @@ GEM test-unit (3.6.2) power_assert tilt (2.3.0) + webrick (1.8.1) PLATFORMS ruby @@ -35,6 +39,7 @@ DEPENDENCIES puma rack rack-test + rackup rake sinatra test-unit From d3884a772d2745335d8505216e95c42f2242953e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 May 2024 11:11:23 +0000 Subject: [PATCH 493/871] chore(deps): bump github.com/progrium/go-basher Bumps [github.com/progrium/go-basher](https://github.com/progrium/go-basher) from 5.1.6+incompatible to 5.1.7+incompatible. - [Release notes](https://github.com/progrium/go-basher/releases) - [Commits](https://github.com/progrium/go-basher/compare/v5.1.6...v5.1.7) --- updated-dependencies: - dependency-name: github.com/progrium/go-basher dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 21169fde4..dbd14b9a6 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module herokuish go 1.17 require ( - github.com/progrium/go-basher v5.1.6+incompatible + github.com/progrium/go-basher v5.1.7+incompatible gopkg.in/yaml.v2 v2.4.0 ) diff --git a/go.sum b/go.sum index 9a20906f0..5bb297e02 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0 h1:iQTw/8FWTuc7uia github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod h1:1NbS8ALrpOvjt0rHPNLyCIeMtbizbir8U//inJ+zuB8= github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= -github.com/progrium/go-basher v5.1.6+incompatible h1:4C9YrvISyUN01W2gEruN1EzMecc75NDiHUjipKuOqls= -github.com/progrium/go-basher v5.1.6+incompatible/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= +github.com/progrium/go-basher v5.1.7+incompatible h1:0ezYhhUW4Ie0h5faBKZWq+Ajn9VyR7mGI3ayi7khS7c= +github.com/progrium/go-basher v5.1.7+incompatible/go.mod h1:Oiy7jZEU1mm+gI1dt5MKYwxptmD37q8/UupxnwhMHtI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= From f19fb295aa408661127791b58202b9f6b8fe3d72 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 23 May 2024 13:38:39 +0000 Subject: [PATCH 494/871] Update nodejs to version v251 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index f7d62f0b3..25953a18d 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v250 +v251 From d2ec92f2c625acf2bff190530822bd06dd9a3b5d Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 30 May 2024 13:38:19 +0000 Subject: [PATCH 495/871] Update php to version v250 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 8717b0002..f7d62f0b3 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v249 +v250 From dd971d40f1afad38c54322b451e4dca089aaa898 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 31 May 2024 11:45:17 +0000 Subject: [PATCH 496/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 249 to 252. - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v249...v252) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 194dba448..2670e02e3 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2080,16 +2080,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v249", + "version": "v252", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd" + "reference": "496743884d098ca4be733636e68377d42df73fe5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd", - "reference": "79b2d9e8f9ea5df5a3df7d3cd977664e54068ebd", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/496743884d098ca4be733636e68377d42df73fe5", + "reference": "496743884d098ca4be733636e68377d42df73fe5", "shasum": "" }, "bin": [ @@ -2119,9 +2119,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v249" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v252" }, - "time": "2024-04-12T17:45:29+00:00" + "time": "2024-05-31T05:33:03+00:00" } ], "aliases": [], From 87183db2818d41fe4fde7340a129df670fefd57f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 4 Jun 2024 13:38:16 +0000 Subject: [PATCH 497/871] Update ruby to version v271 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 92080c51c..fc05c65b3 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v270 +v271 From 0d34ea5c526e4bcf94bcbfca55a66c30b98af56f Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 5 Jun 2024 13:38:23 +0000 Subject: [PATCH 498/871] Update go to version v192 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index ecd0e7fb3..e23f9bdb6 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v191 +v192 From d03fbf6aa9b2e4d70d232ac02c6261d962e5ed5a Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 8 Jun 2024 13:38:25 +0000 Subject: [PATCH 499/871] Update python to version v251 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index f7d62f0b3..25953a18d 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v250 +v251 From 5f815f0b1c8ea30a5d63a6361b049c930e11ddcd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:04:39 +0000 Subject: [PATCH 500/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.0.11 to 3.1.0. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/commits/v3.1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index cbf775ecf..a6d57a672 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.0.11) + rack (3.1.0) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 7a9dc9687f80b399642b5d6471797591af21e046 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 11 Jun 2024 11:46:16 +0000 Subject: [PATCH 501/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.0.11 to 3.1.0. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/commits/v3.1.0) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 47aade7f5..ec78c697f 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.0.11) + rack (3.1.0) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 939f446888afb815d97d4366dc3653f6a6f828be Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 11 Jun 2024 13:38:20 +0000 Subject: [PATCH 502/871] Update nodejs to version v253 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 25953a18d..c78eb4b79 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v251 +v253 From ddf6a4965b2e869f5b1a6ca1e30af645ea7587ba Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 12 Jun 2024 04:23:10 +0000 Subject: [PATCH 503/871] Update php to version v252 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index f7d62f0b3..1980255fe 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v250 +v252 From fd201e4f18e15287a59976ffc6d5793ca3d4b45a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:10:25 +0000 Subject: [PATCH 504/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.1.0 to 3.1.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.0...v3.1.3) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index a6d57a672..0dbc3b493 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.1.0) + rack (3.1.3) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 2a9e7cf699dcd6c0c4bb89339be56eb70fcc2c3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:37:37 +0000 Subject: [PATCH 505/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.1.0 to 3.1.3. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.0...v3.1.3) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index ec78c697f..11c037932 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.0) + rack (3.1.3) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 75e2288235e2d215e0a488f7d0a98c0fb9f91c8d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 12 Jun 2024 11:42:10 +0000 Subject: [PATCH 506/871] chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.6.1 to 3.7.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.1...maven-dependency-plugin-3.7.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index f6f6c8147..d918559dd 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.6.1 + 3.7.0 copy-dependencies From bd8a105707b7216827065442f5a80527a282d952 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 14 Jun 2024 11:46:40 +0000 Subject: [PATCH 507/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 252 to 253. - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v252...v253) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 2670e02e3..b48fc09aa 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2080,16 +2080,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v252", + "version": "v253", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "496743884d098ca4be733636e68377d42df73fe5" + "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/496743884d098ca4be733636e68377d42df73fe5", - "reference": "496743884d098ca4be733636e68377d42df73fe5", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", + "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", "shasum": "" }, "bin": [ @@ -2119,9 +2119,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v252" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v253" }, - "time": "2024-05-31T05:33:03+00:00" + "time": "2024-06-13T14:55:00+00:00" } ], "aliases": [], From 84f4e8d875a3a3dcd5f2348ce61b203b17da1ea4 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 14 Jun 2024 13:38:20 +0000 Subject: [PATCH 508/871] Update ruby to version v272 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index fc05c65b3..df5e3e482 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v271 +v272 From bea419cd6ca6d03e09ab763957f1a1ebd44f54e8 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 14 Jun 2024 13:38:22 +0000 Subject: [PATCH 509/871] Update nodejs to version v254 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index c78eb4b79..24446d231 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v253 +v254 From 354ada42ea8a6d6f33af6d0b51be54070768491b Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 14 Jun 2024 13:38:25 +0000 Subject: [PATCH 510/871] Update php to version v253 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 1980255fe..c78eb4b79 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v252 +v253 From 302680fb784d72a7276b31d3030b2241473f7f09 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 17 Jun 2024 13:38:31 +0000 Subject: [PATCH 511/871] Update python to version v252 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 25953a18d..1980255fe 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v251 +v252 From be5df0d4863320170d89585a60f7dbff404b6e8e Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 21 Jun 2024 02:28:23 -0400 Subject: [PATCH 512/871] Release 0.9.2 - #1205 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 231 to 249 in /buildpacks/buildpack-php/tests/php - #1231 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 249 to 252 in /buildpacks/buildpack-php/tests/php - #1243 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 252 to 253 in /buildpacks/buildpack-php/tests/php - #1191 @dependabot: chore(deps): bump flask from 3.0.2 to 3.0.3 in /buildpacks/buildpack-multi/tests/multi - #1190 @dependabot: chore(deps): bump flask from 3.0.2 to 3.0.3 in /buildpacks/buildpack-python/tests/python-flask - #1226 @dependabot: chore(deps): bump github.com/progrium/go-basher from 5.1.6+incompatible to 5.1.7+incompatible - #1200 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-multi/tests/multi - #1199 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-python/tests/python-django - #1198 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-python/tests/python-flask - #1216 @dependabot: chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /buildpacks/buildpack-multi/tests/multi - #1215 @dependabot: chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /buildpacks/buildpack-python/tests/python-flask - #1197 @dependabot: chore(deps): bump monolog/monolog from 2.9.2 to 2.9.3 in /buildpacks/buildpack-php/tests/php - #1242 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.1 to 3.7.0 in /buildpacks/buildpack-java/tests/java-jetty - #1218 @dependabot: chore(deps): bump rack from 3.0.10 to 3.0.11 in /buildpacks/buildpack-multi/tests/multi - #1237 @dependabot: chore(deps): bump rack from 3.0.11 to 3.1.0 in /buildpacks/buildpack-multi/tests/multi - #1236 @dependabot: chore(deps): bump rack from 3.0.11 to 3.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1241 @dependabot: chore(deps): bump rack from 3.1.0 to 3.1.3 in /buildpacks/buildpack-multi/tests/multi - #1240 @dependabot: chore(deps): bump rack from 3.1.0 to 3.1.3 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1185 @dependabot: chore(deps): bump rake from 13.1.0 to 13.2.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1188 @dependabot: chore(deps): bump rake from 13.2.0 to 13.2.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1219 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra - #1201 @dependabot: chore(deps): bump twig/twig from 3.8.0 to 3.9.1 in /buildpacks/buildpack-php/tests/php - #1202 @dependabot: chore(deps): bump twig/twig from 3.9.1 to 3.9.2 in /buildpacks/buildpack-php/tests/php - #1204 @dependabot: chore(deps): bump twig/twig from 3.9.2 to 3.9.3 in /buildpacks/buildpack-php/tests/php - #1223 @dependabot: chore(deps): bump twig/twig from 3.9.3 to 3.10.3 in /buildpacks/buildpack-php/tests/php - #1234 @dokku-bot: Update go to version v192 - #1245 @dokku-bot: Update nodejs to version v254 - #1246 @dokku-bot: Update php to version v253 - #1247 @dokku-bot: Update python to version v252 - #1244 @dokku-bot: Update ruby to version v272 --- CHANGELOG.md | 33 +++++++++++++++++++++++++++++++++ Makefile | 2 +- README.md | 4 ++-- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 745bbff92..b42ac0562 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,39 @@ All notable changes to this project will be documented in this file. +## [0.9.2](https://github.com/gliderlabs/herokuish/compare/v0.9.1...v0.9.2) - 2024-06-21 + +- #1205 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 231 to 249 in /buildpacks/buildpack-php/tests/php +- #1231 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 249 to 252 in /buildpacks/buildpack-php/tests/php +- #1243 @dependabot: chore(deps-dev): bump heroku/heroku-buildpack-php from 252 to 253 in /buildpacks/buildpack-php/tests/php +- #1191 @dependabot: chore(deps): bump flask from 3.0.2 to 3.0.3 in /buildpacks/buildpack-multi/tests/multi +- #1190 @dependabot: chore(deps): bump flask from 3.0.2 to 3.0.3 in /buildpacks/buildpack-python/tests/python-flask +- #1226 @dependabot: chore(deps): bump github.com/progrium/go-basher from 5.1.6+incompatible to 5.1.7+incompatible +- #1200 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-multi/tests/multi +- #1199 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-python/tests/python-django +- #1198 @dependabot: chore(deps): bump gunicorn from 21.2.0 to 22.0.0 in /buildpacks/buildpack-python/tests/python-flask +- #1216 @dependabot: chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /buildpacks/buildpack-multi/tests/multi +- #1215 @dependabot: chore(deps): bump jinja2 from 3.1.3 to 3.1.4 in /buildpacks/buildpack-python/tests/python-flask +- #1197 @dependabot: chore(deps): bump monolog/monolog from 2.9.2 to 2.9.3 in /buildpacks/buildpack-php/tests/php +- #1242 @dependabot: chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin from 3.6.1 to 3.7.0 in /buildpacks/buildpack-java/tests/java-jetty +- #1218 @dependabot: chore(deps): bump rack from 3.0.10 to 3.0.11 in /buildpacks/buildpack-multi/tests/multi +- #1237 @dependabot: chore(deps): bump rack from 3.0.11 to 3.1.0 in /buildpacks/buildpack-multi/tests/multi +- #1236 @dependabot: chore(deps): bump rack from 3.0.11 to 3.1.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1241 @dependabot: chore(deps): bump rack from 3.1.0 to 3.1.3 in /buildpacks/buildpack-multi/tests/multi +- #1240 @dependabot: chore(deps): bump rack from 3.1.0 to 3.1.3 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1185 @dependabot: chore(deps): bump rake from 13.1.0 to 13.2.0 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1188 @dependabot: chore(deps): bump rake from 13.2.0 to 13.2.1 in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1219 @dependabot: chore(deps): bump sinatra and rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra +- #1201 @dependabot: chore(deps): bump twig/twig from 3.8.0 to 3.9.1 in /buildpacks/buildpack-php/tests/php +- #1202 @dependabot: chore(deps): bump twig/twig from 3.9.1 to 3.9.2 in /buildpacks/buildpack-php/tests/php +- #1204 @dependabot: chore(deps): bump twig/twig from 3.9.2 to 3.9.3 in /buildpacks/buildpack-php/tests/php +- #1223 @dependabot: chore(deps): bump twig/twig from 3.9.3 to 3.10.3 in /buildpacks/buildpack-php/tests/php +- #1234 @dokku-bot: Update go to version v192 +- #1245 @dokku-bot: Update nodejs to version v254 +- #1246 @dokku-bot: Update php to version v253 +- #1247 @dokku-bot: Update python to version v252 +- #1244 @dokku-bot: Update ruby to version v272 + ## [0.9.1](https://github.com/gliderlabs/herokuish/compare/v0.9.0...v0.9.1) - 2024-04-01 - #1181 @josegonzalez: fix: do not unnecessarily create/change files when starting a process diff --git a/Makefile b/Makefile index b289ec0ae..66d33a5d3 100644 --- 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.9.1 +VERSION ?= 0.9.2 IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish diff --git a/README.md b/README.md index 24190069c..4fa4615aa 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.9.1-blue)](https://hub.docker.com/r/gliderlabs/herokuish) +[![Docker Hub](https://img.shields.io/badge/docker%20hub-v0.9.2-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.9.1/herokuish_0.9.1_linux_x86_64.tgz \ +RUN curl --location --silent https://github.com/gliderlabs/herokuish/releases/download/v0.9.2/herokuish_0.9.2_linux_x86_64.tgz \ | tar -xzC /bin ``` From b8e118ac43739a06e5728511ec3d096c3b91ed71 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 22 Jun 2024 13:38:31 +0000 Subject: [PATCH 513/871] Update nodejs to version v255 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 24446d231..c6dd33869 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v254 +v255 From 3daa130d4777799b50feabd0bab6589f3bde2530 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:33:22 +0000 Subject: [PATCH 514/871] chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.0 to 3.7.1. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.0...maven-dependency-plugin-3.7.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index d918559dd..d324464dc 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.0 + 3.7.1 copy-dependencies From 758583b6495892096fb3f0b9b1c201ca60c9705d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:37:48 +0000 Subject: [PATCH 515/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 0dbc3b493..2eef71de6 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.1.3) + rack (3.1.4) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 650b7364d996b4e4f542326c272eff50f7751ff2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 11:48:38 +0000 Subject: [PATCH 516/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.1.3 to 3.1.4. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.3...v3.1.4) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 11c037932..2350faef2 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.3) + rack (3.1.4) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 6b011bd120b904108115928f258e552a782c4b80 Mon Sep 17 00:00:00 2001 From: Dennis Date: Thu, 27 Jun 2024 00:12:28 +0200 Subject: [PATCH 517/871] Publish package for Ubuntu 24.04 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 66d33a5d3..494f318db 100644 --- a/Makefile +++ b/Makefile @@ -180,6 +180,7 @@ release-packagecloud-deb: package_cloud build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/bionic build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/focal build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/jammy build/deb/$(NAME)_$(VERSION)_all.deb + package_cloud push $(PACKAGECLOUD_REPOSITORY)/ubuntu/noble build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/stretch build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/buster build/deb/$(NAME)_$(VERSION)_all.deb package_cloud push $(PACKAGECLOUD_REPOSITORY)/debian/bullseye build/deb/$(NAME)_$(VERSION)_all.deb From ee32e5b8e9ec94711bbeafefed5fb9d7600df2db Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 27 Jun 2024 13:38:19 +0000 Subject: [PATCH 518/871] Update ruby to version v273 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index df5e3e482..d01bc5f51 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v272 +v273 From d6368649348fe238e3e643e38843f8e0c7637b4c Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 29 Jun 2024 13:38:29 +0000 Subject: [PATCH 519/871] Update ruby to version v274 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index d01bc5f51..9af991531 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v273 +v274 From 2c2a3c15fa304436a7a6c8d85be2b2d2284a4da9 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Mon, 1 Jul 2024 13:38:15 +0000 Subject: [PATCH 520/871] Update python to version v253 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 1980255fe..c78eb4b79 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v252 +v253 From 5af06c47a3915292473b787fdced16a4c8747f2e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:15:16 +0000 Subject: [PATCH 521/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.4...v3.1.5) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 2350faef2..8fa7968f4 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.4) + rack (3.1.5) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From ba1b2e36a9d0fc76987d23c49b2ae5ef20a1c205 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 11:46:31 +0000 Subject: [PATCH 522/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.1.4 to 3.1.5. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.4...v3.1.5) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 2eef71de6..22fc676cf 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.1.4) + rack (3.1.5) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From d4ce5282b3f5a499ee7375a44d77e6b01ad3612b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:30:29 +0000 Subject: [PATCH 523/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index 8fa7968f4..b54c865f7 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.5) + rack (3.1.6) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From 4b1cfee8cc12c4b8de77e6e3bd593b4f6a1ce0d9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 11:46:49 +0000 Subject: [PATCH 524/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.1.5 to 3.1.6. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.5...v3.1.6) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index 22fc676cf..a2a778b7a 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.1.5) + rack (3.1.6) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From f17643d657afb17b8cb6a521b95de8032dd0d2f8 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 4 Jul 2024 13:38:29 +0000 Subject: [PATCH 525/871] Update ruby to version v275 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 9af991531..0e80137cc 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v274 +v275 From 674145d95488fd404b71a1939bb30a7aaffb55e1 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 4 Jul 2024 13:38:37 +0000 Subject: [PATCH 526/871] Update nodejs to version v256 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index c6dd33869..810baa82b 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v255 +v256 From cbb1d0194f288e66ba6d9ee42b4ef4834feefa98 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 5 Jul 2024 11:42:35 +0000 Subject: [PATCH 527/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 253 to 254. - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v253...v254) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index b48fc09aa..844e809be 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2080,16 +2080,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v253", + "version": "v254", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1" + "reference": "baf9efb54b14e643df590b9fd55a00f41314b75e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", - "reference": "dd69b2ae22209a47fe4038fd32abd3bdf0eaa2a1", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/baf9efb54b14e643df590b9fd55a00f41314b75e", + "reference": "baf9efb54b14e643df590b9fd55a00f41314b75e", "shasum": "" }, "bin": [ @@ -2119,9 +2119,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v253" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v254" }, - "time": "2024-06-13T14:55:00+00:00" + "time": "2024-07-05T10:56:32+00:00" } ], "aliases": [], From e75010014b2b7bd9a8d27df1afa3b7ad3c59d796 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Fri, 5 Jul 2024 13:38:26 +0000 Subject: [PATCH 528/871] Update php to version v254 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index c78eb4b79..24446d231 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v253 +v254 From 50e26e8f49907ec856b5204cc2c4bc5b17f5df29 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 9 Jul 2024 13:38:15 +0000 Subject: [PATCH 529/871] Update ruby to version v276 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 0e80137cc..8974eb956 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v275 +v276 From 393c83d540d5768fe83e30fc2c9b20731d77afd7 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 10 Jul 2024 13:38:19 +0000 Subject: [PATCH 530/871] Update nodejs to version v257 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 810baa82b..65823ccea 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v256 +v257 From e3d9875cc296c2c6487640add8fe56ce06de9aa1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:17:43 +0000 Subject: [PATCH 531/871] chore(deps): bump rack in /buildpacks/buildpack-multi/tests/multi Bumps [rack](https://github.com/rack/rack) from 3.1.6 to 3.1.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.6...v3.1.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock index b54c865f7..96ff9245b 100644 --- a/buildpacks/buildpack-multi/tests/multi/Gemfile.lock +++ b/buildpacks/buildpack-multi/tests/multi/Gemfile.lock @@ -4,7 +4,7 @@ GEM base64 (0.2.0) mustermann (3.0.0) ruby2_keywords (~> 0.0.1) - rack (3.1.6) + rack (3.1.7) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From f4337d4ff8ea69a5b7fa1019f025fe11213ca078 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 11 Jul 2024 13:38:18 +0000 Subject: [PATCH 532/871] Update ruby to version v277 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index 8974eb956..cbb812f67 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v276 +v277 From 3ae0d540d0b16858c9a21c05946a983b209665c0 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 11 Jul 2024 13:38:20 +0000 Subject: [PATCH 533/871] Update nodejs to version v258 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 65823ccea..1fb858c0d 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v257 +v258 From 43cdc41a1f4838e82241c280fee9e28b89ff34e7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:08:42 +0000 Subject: [PATCH 534/871] chore(deps): bump rack in /buildpacks/buildpack-ruby/tests/ruby-sinatra Bumps [rack](https://github.com/rack/rack) from 3.1.6 to 3.1.7. - [Release notes](https://github.com/rack/rack/releases) - [Changelog](https://github.com/rack/rack/blob/main/CHANGELOG.md) - [Commits](https://github.com/rack/rack/compare/v3.1.6...v3.1.7) --- updated-dependencies: - dependency-name: rack dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock index a2a778b7a..b312927b2 100644 --- a/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock +++ b/buildpacks/buildpack-ruby/tests/ruby-sinatra/Gemfile.lock @@ -8,7 +8,7 @@ GEM power_assert (2.0.3) puma (6.4.2) nio4r (~> 2.0) - rack (3.1.6) + rack (3.1.7) rack-protection (4.0.0) base64 (>= 0.1.0) rack (>= 3.0.0, < 4) From a62d4952572f1ccbba5d2569223d8c3a938dbfde Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 16 Jul 2024 13:38:16 +0000 Subject: [PATCH 535/871] Update python to version v254 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index c78eb4b79..24446d231 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v253 +v254 From ab19a4aca9beab0c011ad25a21bd996d0dc386eb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 16 Jul 2024 13:38:21 +0000 Subject: [PATCH 536/871] Update go to version v193 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index e23f9bdb6..275de7953 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v192 +v193 From d7efd4403ce1a80c82e3e40cc4337b893400a5d2 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 20 Jul 2024 13:38:24 +0000 Subject: [PATCH 537/871] Update nodejs to version v260 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 1fb858c0d..0a7f56edd 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v258 +v260 From eeccd5184535df10cad335989056efc864c27ccb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 30 Jul 2024 13:38:17 +0000 Subject: [PATCH 538/871] Update nodejs to version v261 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index 0a7f56edd..a308b0d5e 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v260 +v261 From a6e004bef97c3c89f3bcd875bcf9771ccdaf5cc4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 9 Aug 2024 11:30:37 +0000 Subject: [PATCH 539/871] chore(deps): bump twig/twig in /buildpacks/buildpack-php/tests/php Bumps [twig/twig](https://github.com/twigphp/Twig) from 3.10.3 to 3.11.0. - [Changelog](https://github.com/twigphp/Twig/blob/3.x/CHANGELOG) - [Commits](https://github.com/twigphp/Twig/compare/v3.10.3...v3.11.0) --- updated-dependencies: - dependency-name: twig/twig dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .../buildpack-php/tests/php/composer.lock | 127 ++++++++++++++---- 1 file changed, 102 insertions(+), 25 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 844e809be..138932748 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -1058,16 +1058,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4" + "reference": "0424dff1c58f028c451efff2045f5d92410bd540" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ef4d7e442ca910c4764bce785146269b30cb5fc4", - "reference": "ef4d7e442ca910c4764bce785146269b30cb5fc4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/0424dff1c58f028c451efff2045f5d92410bd540", + "reference": "0424dff1c58f028c451efff2045f5d92410bd540", "shasum": "" }, "require": { @@ -1117,7 +1117,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.30.0" }, "funding": [ { @@ -1133,7 +1133,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" }, { "name": "symfony/polyfill-intl-idn", @@ -1308,16 +1308,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec" + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9773676c8a1bb1f8d4340a62efe641cf76eda7ec", - "reference": "9773676c8a1bb1f8d4340a62efe641cf76eda7ec", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/fd22ab50000ef01661e2a31d850ebaa297f8e03c", + "reference": "fd22ab50000ef01661e2a31d850ebaa297f8e03c", "shasum": "" }, "require": { @@ -1368,7 +1368,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.30.0" }, "funding": [ { @@ -1384,7 +1384,7 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/polyfill-php72", @@ -1543,16 +1543,16 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.29.0", + "version": "v1.30.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b" + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", - "reference": "87b68208d5c1188808dd7839ee1e6c8ec3b02f1b", + "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/77fa7995ac1b21ab60769b7323d600a991a90433", + "reference": "77fa7995ac1b21ab60769b7323d600a991a90433", "shasum": "" }, "require": { @@ -1603,7 +1603,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.29.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.30.0" }, "funding": [ { @@ -1619,7 +1619,83 @@ "type": "tidelift" } ], - "time": "2024-01-29T20:11:03+00:00" + "time": "2024-05-31T15:07:36+00:00" + }, + { + "name": "symfony/polyfill-php81", + "version": "v1.30.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-php81.git", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/3fb075789fb91f9ad9af537c4012d523085bd5af", + "reference": "3fb075789fb91f9ad9af537c4012d523085bd5af", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "type": "library", + "extra": { + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Php81\\": "" + }, + "classmap": [ + "Resources/stubs" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-php81/tree/v1.30.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2024-06-19T12:30:46+00:00" }, { "name": "symfony/routing", @@ -1999,16 +2075,16 @@ }, { "name": "twig/twig", - "version": "v3.10.3", + "version": "v3.11.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572" + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/67f29781ffafa520b0bbfbd8384674b42db04572", - "reference": "67f29781ffafa520b0bbfbd8384674b42db04572", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", + "reference": "e80fb8ebba85c7341a97a9ebf825d7fd4b77708d", "shasum": "" }, "require": { @@ -2016,7 +2092,8 @@ "symfony/deprecation-contracts": "^2.5|^3", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-mbstring": "^1.3", - "symfony/polyfill-php80": "^1.22" + "symfony/polyfill-php80": "^1.22", + "symfony/polyfill-php81": "^1.29" }, "require-dev": { "psr/container": "^1.0|^2.0", @@ -2062,7 +2139,7 @@ ], "support": { "issues": "https://github.com/twigphp/Twig/issues", - "source": "https://github.com/twigphp/Twig/tree/v3.10.3" + "source": "https://github.com/twigphp/Twig/tree/v3.11.0" }, "funding": [ { @@ -2074,7 +2151,7 @@ "type": "tidelift" } ], - "time": "2024-05-16T10:04:27+00:00" + "time": "2024-08-08T16:15:16+00:00" } ], "packages-dev": [ From ef2e627c789ad78986cb106bc250610aa45114cb Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 6 Aug 2024 13:38:17 +0000 Subject: [PATCH 540/871] Update ruby to version v278 --- buildpacks/buildpack-ruby/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-ruby/buildpack-version b/buildpacks/buildpack-ruby/buildpack-version index cbb812f67..0513c4743 100644 --- a/buildpacks/buildpack-ruby/buildpack-version +++ b/buildpacks/buildpack-ruby/buildpack-version @@ -1 +1 @@ -v277 +v278 From 1874130ffd4e338538b41c3dbfe144d67fa18e78 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Sat, 3 Aug 2024 13:38:35 +0000 Subject: [PATCH 541/871] Update php to version v255 --- buildpacks/buildpack-php/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-php/buildpack-version b/buildpacks/buildpack-php/buildpack-version index 24446d231..c6dd33869 100644 --- a/buildpacks/buildpack-php/buildpack-version +++ b/buildpacks/buildpack-php/buildpack-version @@ -1 +1 @@ -v254 +v255 From d6681d9d3a2f55625156da32b9daf7f94ce80f25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 5 Aug 2024 11:15:56 +0000 Subject: [PATCH 542/871] chore(deps-dev): bump heroku/heroku-buildpack-php Bumps [heroku/heroku-buildpack-php](https://github.com/heroku/heroku-buildpack-php) from 254 to 255. - [Changelog](https://github.com/heroku/heroku-buildpack-php/blob/main/CHANGELOG.md) - [Commits](https://github.com/heroku/heroku-buildpack-php/compare/v254...v255) --- updated-dependencies: - dependency-name: heroku/heroku-buildpack-php dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-php/tests/php/composer.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/buildpacks/buildpack-php/tests/php/composer.lock b/buildpacks/buildpack-php/tests/php/composer.lock index 138932748..da473ef72 100644 --- a/buildpacks/buildpack-php/tests/php/composer.lock +++ b/buildpacks/buildpack-php/tests/php/composer.lock @@ -2157,16 +2157,16 @@ "packages-dev": [ { "name": "heroku/heroku-buildpack-php", - "version": "v254", + "version": "v255", "source": { "type": "git", "url": "https://github.com/heroku/heroku-buildpack-php.git", - "reference": "baf9efb54b14e643df590b9fd55a00f41314b75e" + "reference": "3163beae4bc19943e0c3ccf4b1e476993c24101c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/baf9efb54b14e643df590b9fd55a00f41314b75e", - "reference": "baf9efb54b14e643df590b9fd55a00f41314b75e", + "url": "https://api.github.com/repos/heroku/heroku-buildpack-php/zipball/3163beae4bc19943e0c3ccf4b1e476993c24101c", + "reference": "3163beae4bc19943e0c3ccf4b1e476993c24101c", "shasum": "" }, "bin": [ @@ -2196,9 +2196,9 @@ ], "support": { "issues": "https://github.com/heroku/heroku-buildpack-php/issues", - "source": "https://github.com/heroku/heroku-buildpack-php/tree/v254" + "source": "https://github.com/heroku/heroku-buildpack-php/tree/v255" }, - "time": "2024-07-05T10:56:32+00:00" + "time": "2024-08-02T14:53:27+00:00" } ], "aliases": [], From 62d14823480e9252523d590b4c6d955112d23780 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 8 Aug 2024 13:38:17 +0000 Subject: [PATCH 543/871] Update python to version v255 --- buildpacks/buildpack-python/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/buildpack-version b/buildpacks/buildpack-python/buildpack-version index 24446d231..c6dd33869 100644 --- a/buildpacks/buildpack-python/buildpack-version +++ b/buildpacks/buildpack-python/buildpack-version @@ -1 +1 @@ -v254 +v255 From 23a4f46d0486185a70baaed854e6defeb33979d4 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Thu, 8 Aug 2024 13:38:21 +0000 Subject: [PATCH 544/871] Update go to version v194 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 275de7953..2290750d6 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v193 +v194 From 64998716f8879845e9514fa891c8a50dbb5ab319 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 11 Aug 2024 04:17:57 -0400 Subject: [PATCH 545/871] chore: update ci runners to ubuntu-22.04 --- .github/workflows/main.yml | 4 ++-- .github/workflows/release.yml | 2 +- .github/workflows/tag-release.yml | 4 ++-- .github/workflows/update.yml | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c1bf005e2..4e1e10028 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ concurrency: jobs: build: name: build.${{ matrix.heroku }}-${{ matrix.buildx }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: true matrix: @@ -92,7 +92,7 @@ jobs: unit-tests: name: unit.heroku-${{ matrix.heroku }}.${{ matrix.buildpack }} needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d80bc45f5..abdef2013 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -10,7 +10,7 @@ on: jobs: build: name: release - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: false matrix: diff --git a/.github/workflows/tag-release.yml b/.github/workflows/tag-release.yml index d3f073712..6c6ea72fa 100644 --- a/.github/workflows/tag-release.yml +++ b/.github/workflows/tag-release.yml @@ -10,7 +10,7 @@ on: jobs: build: name: build.${{ matrix.heroku }}-${{ matrix.buildx }} - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 strategy: fail-fast: true matrix: @@ -58,7 +58,7 @@ jobs: tag-release: name: tag-release needs: build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index b9ff547ab..ff7a0746d 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -4,13 +4,13 @@ name: Bump buildpacks # yamllint disable-line rule:truthy on: schedule: - - cron: '37 13 * * *' + - cron: "37 13 * * *" workflow_dispatch: {} jobs: build: name: bump-buildpacks - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v4 with: From e608b05f82b91d1f7a3e3174bedd40a9e782272d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:02:50 +0000 Subject: [PATCH 546/871] chore(deps): bump gunicorn in /buildpacks/buildpack-multi/tests/multi Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 22.0.0 to 23.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/22.0.0...23.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-multi/tests/multi/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-multi/tests/multi/requirements.txt b/buildpacks/buildpack-multi/tests/multi/requirements.txt index 4c8df95ed..4234e3aab 100644 --- a/buildpacks/buildpack-multi/tests/multi/requirements.txt +++ b/buildpacks/buildpack-multi/tests/multi/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 Jinja2==3.1.4 -gunicorn==22.0.0 +gunicorn==23.0.0 markupsafe==2.1.5 From 6d228343e5f61b64f5ce53b8bc472ecd506d1734 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:05:43 +0000 Subject: [PATCH 547/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 22.0.0 to 23.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/22.0.0...23.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-python/tests/python-flask/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-flask/requirements.txt b/buildpacks/buildpack-python/tests/python-flask/requirements.txt index 4c8df95ed..4234e3aab 100644 --- a/buildpacks/buildpack-python/tests/python-flask/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-flask/requirements.txt @@ -1,4 +1,4 @@ Flask==3.0.3 Jinja2==3.1.4 -gunicorn==22.0.0 +gunicorn==23.0.0 markupsafe==2.1.5 From 632c6eff0aa3fd8073a744c957408ea813b03c76 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 12 Aug 2024 11:41:19 +0000 Subject: [PATCH 548/871] chore(deps): bump gunicorn Bumps [gunicorn](https://github.com/benoitc/gunicorn) from 22.0.0 to 23.0.0. - [Release notes](https://github.com/benoitc/gunicorn/releases) - [Commits](https://github.com/benoitc/gunicorn/compare/22.0.0...23.0.0) --- updated-dependencies: - dependency-name: gunicorn dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .../buildpack-python/tests/python-django/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-python/tests/python-django/requirements.txt b/buildpacks/buildpack-python/tests/python-django/requirements.txt index 8120518cd..7484cae9b 100644 --- a/buildpacks/buildpack-python/tests/python-django/requirements.txt +++ b/buildpacks/buildpack-python/tests/python-django/requirements.txt @@ -1,2 +1,2 @@ Django==2.2.28 -gunicorn==22.0.0 +gunicorn==23.0.0 From a5dd48cde24e7cbf35b05f8ef1f00e5f8fcb1fbe Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Tue, 13 Aug 2024 13:38:13 +0000 Subject: [PATCH 549/871] Update nodejs to version v262 --- buildpacks/buildpack-nodejs/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-nodejs/buildpack-version b/buildpacks/buildpack-nodejs/buildpack-version index a308b0d5e..3f0ab0065 100644 --- a/buildpacks/buildpack-nodejs/buildpack-version +++ b/buildpacks/buildpack-nodejs/buildpack-version @@ -1 +1 @@ -v261 +v262 From d0a2ab51041193f0ca64149b9bdfaa06329502f4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 14 Aug 2024 12:01:12 +0000 Subject: [PATCH 550/871] chore(deps): bump golang from 1.22 to 1.23 Bumps golang from 1.22 to 1.23. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 36eab300d..2ba00e1f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # syntax=docker/dockerfile:1 ARG STACK_VERSION=20 -FROM golang:1.22 AS builder +FROM golang:1.23 AS builder RUN mkdir /src COPY . /src/ WORKDIR /src From f7b6e1cacf550b093f5eb9b3da526dad88a0bbc5 Mon Sep 17 00:00:00 2001 From: Dokku Bot Date: Wed, 14 Aug 2024 13:38:25 +0000 Subject: [PATCH 551/871] Update go to version v195 --- buildpacks/buildpack-go/buildpack-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-go/buildpack-version b/buildpacks/buildpack-go/buildpack-version index 2290750d6..bd80f5c1e 100644 --- a/buildpacks/buildpack-go/buildpack-version +++ b/buildpacks/buildpack-go/buildpack-version @@ -1 +1 @@ -v194 +v195 From 9ce969f286fac5c19d9e1a4cb75b8ba256ed7a68 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Mon, 19 Aug 2024 02:56:40 -0400 Subject: [PATCH 552/871] chore: drop linux/arm (32-bit) support Builds are slow and most/all buildpacks target amd64 anyways, so there isn't much benefit to supporting this. --- Makefile | 4 ++-- bin/setup.sh | 12 +----------- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 494f318db..dd8a7241d 100644 --- a/Makefile +++ b/Makefile @@ -61,9 +61,9 @@ build/docker: build/docker/$(STACK_VERSION): bindata.go ifeq ($(BUILDX),true) ifeq ($(STACK_VERSION),20) - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) -t $(IMAGE_NAME):latest . else - docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm,linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . + docker buildx build --no-cache ${DOCKER_ARGS} --pull --progress plain --platform linux/arm64/v8,linux/amd64 --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) . endif else docker build --no-cache ${DOCKER_ARGS} --pull --progress plain --build-arg STACK_VERSION=$(STACK_VERSION) --build-arg VERSION=$(VERSION) -t $(IMAGE_NAME):$(BUILD_TAG)-$(STACK_VERSION) -t $(IMAGE_NAME):latest-$(STACK_VERSION) -t $(IMAGE_NAME):$(BUILD_TAG) . diff --git a/bin/setup.sh b/bin/setup.sh index 5f077cd7d..7f3132e0a 100755 --- a/bin/setup.sh +++ b/bin/setup.sh @@ -10,18 +10,13 @@ setup_02="$(cat /tmp/setup-02.sh)" echo "$setup_01" >/tmp/setup-01.sh chmod +x /tmp/setup-01.sh -# Ensure we install from ports for arm/arm64 systems +# Ensure we install from ports for arm64 systems # Skip unsupported syslinux if [[ -n "$TARGETARCH" ]] && [[ "$TARGETARCH" != "amd64" ]]; then sed -i 's#http://archive.ubuntu.com/ubuntu/#http://ports.ubuntu.com/ubuntu-ports/#' /tmp/setup-01.sh sed -i '/syslinux/d' /tmp/setup-01.sh fi -# Skip unsupported postgresql on arm:20 -if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-client-16/d' /tmp/setup-01.sh -fi - # from base image /tmp/setup-01.sh @@ -41,11 +36,6 @@ rm -rf /var/lib/apt/lists/* echo "$setup_02" >/tmp/setup-02.sh chmod +x /tmp/setup-02.sh -# Skip unsupported postgresql on arm:20 -if [[ "$TARGETARCH" == "arm" ]]; then - sed -i '/postgresql-server-dev-16/d' /tmp/setup-02.sh -fi - # from build image /tmp/setup-02.sh From 4db71531fbab320de6a27d870baa608c4e2e7657 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 22 Aug 2024 12:02:55 +0000 Subject: [PATCH 553/871] chore(deps): bump org.apache.maven.plugins:maven-dependency-plugin Bumps [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/apache/maven-dependency-plugin/releases) - [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.7.1...maven-dependency-plugin-3.8.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-dependency-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- buildpacks/buildpack-java/tests/java-jetty/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildpacks/buildpack-java/tests/java-jetty/pom.xml b/buildpacks/buildpack-java/tests/java-jetty/pom.xml index d324464dc..12868dbbf 100644 --- a/buildpacks/buildpack-java/tests/java-jetty/pom.xml +++ b/buildpacks/buildpack-java/tests/java-jetty/pom.xml @@ -23,7 +23,7 @@ org.apache.maven.plugins maven-dependency-plugin - 3.7.1 + 3.8.0 copy-dependencies From a19f325c7a5f1f97b45285286276497ae2cde15c Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sat, 24 Aug 2024 20:12:02 -0400 Subject: [PATCH 554/871] chore: remove unmaintained buildpack Play applications are now deployed via the scala buildpack, and the play buildpack has been unmaintained since 2017. Since the oldest version of herokuish that is currently supported is 2020, dropping support (and making a minor release) is sufficient. --- Makefile | 2 +- buildpacks/buildpack-play/buildpack-url | 1 - buildpacks/buildpack-play/buildpack-version | 1 - buildpacks/buildpack-play/tests/play/Procfile | 1 - .../play/app/controllers/Application.java | 14 -- .../tests/play/app/views/index.scala.html | 20 --- .../tests/play/app/views/main.scala.html | 15 -- .../tests/play/app/views/welcome.scala.html | 137 ------------------ .../buildpack-play/tests/play/build.sbt | 10 -- .../tests/play/conf/application.conf | 69 --------- .../tests/play/conf/dependencies.yml | 4 - .../buildpack-play/tests/play/conf/routes | 9 -- .../tests/play/project/build.properties | 1 - .../tests/play/project/plugins.sbt | 5 - .../tests/play/public/images/favicon.png | Bin 687 -> 0 bytes .../public/javascripts/jquery-1.9.0.min.js | 4 - .../tests/play/public/stylesheets/main.css | 0 buildpacks/buildpack-play/tests/play/test.sh | 4 - .../tests/play/test/ApplicationTest.java | 44 ------ .../tests/play/test/IntegrationTest.java | 28 ---- 20 files changed, 1 insertion(+), 368 deletions(-) delete mode 100644 buildpacks/buildpack-play/buildpack-url delete mode 100644 buildpacks/buildpack-play/buildpack-version delete mode 100644 buildpacks/buildpack-play/tests/play/Procfile delete mode 100644 buildpacks/buildpack-play/tests/play/app/controllers/Application.java delete mode 100644 buildpacks/buildpack-play/tests/play/app/views/index.scala.html delete mode 100644 buildpacks/buildpack-play/tests/play/app/views/main.scala.html delete mode 100644 buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html delete mode 100644 buildpacks/buildpack-play/tests/play/build.sbt delete mode 100644 buildpacks/buildpack-play/tests/play/conf/application.conf delete mode 100644 buildpacks/buildpack-play/tests/play/conf/dependencies.yml delete mode 100644 buildpacks/buildpack-play/tests/play/conf/routes delete mode 100644 buildpacks/buildpack-play/tests/play/project/build.properties delete mode 100644 buildpacks/buildpack-play/tests/play/project/plugins.sbt delete mode 100644 buildpacks/buildpack-play/tests/play/public/images/favicon.png delete mode 100644 buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js delete mode 100644 buildpacks/buildpack-play/tests/play/public/stylesheets/main.css delete mode 100644 buildpacks/buildpack-play/tests/play/test.sh delete mode 100644 buildpacks/buildpack-play/tests/play/test/ApplicationTest.java delete mode 100644 buildpacks/buildpack-play/tests/play/test/IntegrationTest.java diff --git a/Makefile b/Makefile index dd8a7241d..61e2f587b 100644 --- a/Makefile +++ b/Makefile @@ -9,7 +9,7 @@ IMAGE_NAME ?= $(NAME) BUILD_TAG ?= dev PACKAGECLOUD_REPOSITORY ?= dokku/dokku-betafish -BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala play php go static null +BUILDPACK_ORDER := multi ruby nodejs clojure python java gradle scala php go static null SHELL := /bin/bash SYSTEM := $(shell sh -c 'uname -s 2>/dev/null') DOCKER_ARGS ?= "--pull" diff --git a/buildpacks/buildpack-play/buildpack-url b/buildpacks/buildpack-play/buildpack-url deleted file mode 100644 index 964c71d51..000000000 --- a/buildpacks/buildpack-play/buildpack-url +++ /dev/null @@ -1 +0,0 @@ -https://github.com/heroku/heroku-buildpack-play diff --git a/buildpacks/buildpack-play/buildpack-version b/buildpacks/buildpack-play/buildpack-version deleted file mode 100644 index 4aa0e0a78..000000000 --- a/buildpacks/buildpack-play/buildpack-version +++ /dev/null @@ -1 +0,0 @@ -v26 diff --git a/buildpacks/buildpack-play/tests/play/Procfile b/buildpacks/buildpack-play/tests/play/Procfile deleted file mode 100644 index 4ff02e214..000000000 --- a/buildpacks/buildpack-play/tests/play/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: target/universal/stage/bin/exampleapp -Dhttp.port=$PORT diff --git a/buildpacks/buildpack-play/tests/play/app/controllers/Application.java b/buildpacks/buildpack-play/tests/play/app/controllers/Application.java deleted file mode 100644 index 9a3d9bce3..000000000 --- a/buildpacks/buildpack-play/tests/play/app/controllers/Application.java +++ /dev/null @@ -1,14 +0,0 @@ -package controllers; - -import play.*; -import play.mvc.*; - -import views.html.*; - -public class Application extends Controller { - - public Result index() { - return ok("play\n"); - } - -} diff --git a/buildpacks/buildpack-play/tests/play/app/views/index.scala.html b/buildpacks/buildpack-play/tests/play/app/views/index.scala.html deleted file mode 100644 index 63772f5f9..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/index.scala.html +++ /dev/null @@ -1,20 +0,0 @@ -@* - * This template takes a two arguments, a String containing a - * message to display and an AssetsFinder to locate static assets. - *@ -@(message: String) - -@* - * Call the `main` template with two arguments. The first - * argument is a `String` with the title of the page, the second - * argument is an `Html` object containing the body of the page. - *@ -@main("Welcome to Play") { - - @* - * Get an `Html` object by calling the built-in Play welcome - * template and passing a `String` message. - *@ - @welcome(message, style = "scala") - -} diff --git a/buildpacks/buildpack-play/tests/play/app/views/main.scala.html b/buildpacks/buildpack-play/tests/play/app/views/main.scala.html deleted file mode 100644 index 6c72d80e2..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/main.scala.html +++ /dev/null @@ -1,15 +0,0 @@ -@(title: String)(content: Html) - - - - - - @title - - - - - - @content - - diff --git a/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html b/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html deleted file mode 100644 index 1c65bf648..000000000 --- a/buildpacks/buildpack-play/tests/play/app/views/welcome.scala.html +++ /dev/null @@ -1,137 +0,0 @@ -@(message: String, style: String = "scala") - -@defining(play.core.PlayVersion.current) { version => - -
-
-

@message

-
-
- -
-
- -

Welcome to Play

- -

- Congratulations, you’ve just created a new Play application. This page will help you with the next few steps. -

- -
-

- You’re using Play @version -

-
- -

Why do you see this page?

- -

- The conf/routes file defines a route that tells Play to invoke the HomeController.index action - whenever a browser requests the / URI using the GET method: -

- -
# Home page
-GET     /               controllers.HomeController.index
- -

- Play has invoked the controllers.HomeController.index method to obtain the Action to execute: -

- -
def index = Action {
-  Ok(views.html.index("Your new application is ready."))
-}
- -

- An action is a function that handles the incoming HTTP request, and returns the HTTP result to send back to the web client. - Here we send a 200 OK response, using a template to fill its content. -

- -

- The template is defined in the app/views/index.scala.html file and compiled as a Scala function. -

- -
@@(message: String)
-
-@@main("Welcome to Play") {
-
-    @@welcome(message, style = "scala")
-
-}
- -

- The first line of the template defines the function signature. Here it just takes a single String parameter. - This template then calls another function defined in app/views/main.scala.html, which displays the HTML - layout, and another function that displays this welcome message. You can freely add any HTML fragment mixed with Scala - code in this file. -

- -

You can read more about Twirl, the template language used by Play, and how Play handles actions.

- -

Need more info on the console?

- -

- For more information on the various commands you can run on Play, i.e. running tests and packaging applications for production, see Using the Play console. -

- -

Need to set up an IDE?

- -

- You can start hacking your application right now using any text editor. Any changes will be automatically reloaded at each page refresh, - including modifications made to Scala source files. -

- -

- If you want to set-up your application in IntelliJ IDEA or any other Java IDE, check the - Setting up your preferred IDE page. -

- -

Need more documentation?

- -

- Play documentation is available at https://www.playframework.com/documentation. -

- -

- Play comes with lots of example templates showcasing various bits of Play functionality at https://www.playframework.com/download#examples. -

- -

Need more help?

- -

- Play questions are asked and answered on Stackoverflow using the "playframework" tag: https://stackoverflow.com/questions/tagged/playframework -

- -

- The Discuss Play Forum is where Play users come to seek help, - announce projects, and discuss issues and new features. -

- -

- Gitter is a real time chat channel, like IRC. The playframework/playframework channel is used by Play users to discuss the ins and outs of writing great Play applications. -

- -
- - - -
-} diff --git a/buildpacks/buildpack-play/tests/play/build.sbt b/buildpacks/buildpack-play/tests/play/build.sbt deleted file mode 100644 index e83055422..000000000 --- a/buildpacks/buildpack-play/tests/play/build.sbt +++ /dev/null @@ -1,10 +0,0 @@ -name := "exampleApp" - -version := "1.0-SNAPSHOT" - -libraryDependencies ++= Seq( - javaJdbc, - guice -) - -lazy val root = (project in file(".")).enablePlugins(PlayScala) diff --git a/buildpacks/buildpack-play/tests/play/conf/application.conf b/buildpacks/buildpack-play/tests/play/conf/application.conf deleted file mode 100644 index 7485e4ce4..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/application.conf +++ /dev/null @@ -1,69 +0,0 @@ -# This is the main configuration file for the application. -# ~~~~~ - -# Secret key -# ~~~~~ -# The secret key is used to secure cryptographics functions. -# If you deploy your application to several instances be sure to use the same key! -play.http.secret.key="UdmA?IWB:ITcH4tSSXs03SMd" - -# The application languages -# ~~~~~ -play.i18n.langs = ["en"] - -# Global object class -# ~~~~~ -# Define the Global object class for this application. -# Default to Global in the root package. -# application.global=Global - -# Router -# ~~~~~ -# Define the Router object to use for this application. -# This router will be looked up first when the application is starting up, -# so make sure this is the entry point. -# Furthermore, it's assumed your route file is named properly. -# So for an application router like `conf/my.application.Router`, -# you may need to define a router file `my.application.routes`. -# Default to Routes in the root package (and `conf/routes`) -# application.router=my.application.Routes - -# Database configuration -# ~~~~~ -# You can declare as many datasources as you want. -# By convention, the default datasource is named `default` -# -# db.default.driver=org.h2.Driver -# db.default.url="jdbc:h2:mem:play" -# db.default.user=sa -# db.default.password="" -# -# You can expose this datasource via JNDI if needed (Useful for JPA) -# db.default.jndiName=DefaultDS - -# Evolutions -# ~~~~~ -# You can disable evolutions if needed -# evolutionplugin=disabled - -# Ebean configuration -# ~~~~~ -# You can declare as many Ebean servers as you want. -# By convention, the default server is named `default` -# -# ebean.default="models.*" - -# Logger -# ~~~~~ -# You can also configure logback (http://logback.qos.ch/), -# by providing an application-logger.xml file in the conf directory. - -# Root logger: -logger.root=ERROR - -# Logger used by the framework: -logger.play=INFO - -# Logger provided to your application: -logger.application=DEBUG - diff --git a/buildpacks/buildpack-play/tests/play/conf/dependencies.yml b/buildpacks/buildpack-play/tests/play/conf/dependencies.yml deleted file mode 100644 index 108ad473e..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/dependencies.yml +++ /dev/null @@ -1,4 +0,0 @@ -# Application dependencies - -require: - - play 2.8.2 diff --git a/buildpacks/buildpack-play/tests/play/conf/routes b/buildpacks/buildpack-play/tests/play/conf/routes deleted file mode 100644 index d865bc769..000000000 --- a/buildpacks/buildpack-play/tests/play/conf/routes +++ /dev/null @@ -1,9 +0,0 @@ -# Routes -# This file defines all application routes (Higher priority routes first) -# ~~~~ - -# Home page -GET / controllers.Application.index() - -# Map static resources from the /public folder to the /assets URL path -GET /assets/*file controllers.Assets.at(path="/public", file) diff --git a/buildpacks/buildpack-play/tests/play/project/build.properties b/buildpacks/buildpack-play/tests/play/project/build.properties deleted file mode 100644 index 0837f7a13..000000000 --- a/buildpacks/buildpack-play/tests/play/project/build.properties +++ /dev/null @@ -1 +0,0 @@ -sbt.version=1.3.13 diff --git a/buildpacks/buildpack-play/tests/play/project/plugins.sbt b/buildpacks/buildpack-play/tests/play/project/plugins.sbt deleted file mode 100644 index eb33617aa..000000000 --- a/buildpacks/buildpack-play/tests/play/project/plugins.sbt +++ /dev/null @@ -1,5 +0,0 @@ -// Comment to get more information during initialization -logLevel := Level.Warn - -// Use the Play sbt plugin for Play projects -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.8.2") diff --git a/buildpacks/buildpack-play/tests/play/public/images/favicon.png b/buildpacks/buildpack-play/tests/play/public/images/favicon.png deleted file mode 100644 index c7d92d2ae47434d9a61c90bc205e099b673b9dd5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 687 zcmV;g0#N;lP)ezT{T_ZJ?}AL z5NC{NW(ESID=>(O3&Eg8 zmA9J&6c`h4_f6L;=bU>_H8aNG`kfvCj9zomNt)?O;rzWqZs0LEt%1WB218%1fo9uB zsW^yhBR7C(mqN%GEK9&msg0~ zWY?#bf4q8G-~2KttQZ($odJvy&_-~f?9*ThK@fwR$U^1)p*8=_+^3BXx0$i1BC8XC zr21u6D5nVK&^!dOAw&|1E;qC3uFNj3*Jj#&%Oje@0D-nhfmM*o%^5f}-pxQ07(95H z3|LoV>V19w#rLgmRmtVy9!T3M3FUE3><0T8&b3yEsWcLW`0(=1+qsqc(k(ymBLK0h zK!6(6$7MX~M`-QA2$wk7n(7hhkJ}4Rwi-Vd(_ZFX1Yk7TXuB0IJYpo@kLb2G8m)E{ z`9v=!hi}fOytKckfN^C@6+Z*+MVI9-W_p@_3yyR#UYc0FTpD}i#k>c!wYCS)4v@E$ zchZCo=zV@)`v^$;V18ixdjFMY#q^2$wEX%{f(XD8POnsn$bpbClpC@hPxjzyO>pY|*pF3UU2tYcCN?rUk{Sskej70Mmu9vPwMYhO1m{AxAt(zqDT|0jP7FaX=6 V`?~}E4H^Id002ovPDHLkV1hC)G==~G diff --git a/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js b/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js deleted file mode 100644 index 50d1b22f2..000000000 --- a/buildpacks/buildpack-play/tests/play/public/javascripts/jquery-1.9.0.min.js +++ /dev/null @@ -1,4 +0,0 @@ -/*! jQuery v1.9.0 | (c) 2005, 2012 jQuery Foundation, Inc. | jquery.org/license */(function(e,t){"use strict";function n(e){var t=e.length,n=st.type(e);return st.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}function r(e){var t=Tt[e]={};return st.each(e.match(lt)||[],function(e,n){t[n]=!0}),t}function i(e,n,r,i){if(st.acceptData(e)){var o,a,s=st.expando,u="string"==typeof n,l=e.nodeType,c=l?st.cache:e,f=l?e[s]:e[s]&&s;if(f&&c[f]&&(i||c[f].data)||!u||r!==t)return f||(l?e[s]=f=K.pop()||st.guid++:f=s),c[f]||(c[f]={},l||(c[f].toJSON=st.noop)),("object"==typeof n||"function"==typeof n)&&(i?c[f]=st.extend(c[f],n):c[f].data=st.extend(c[f].data,n)),o=c[f],i||(o.data||(o.data={}),o=o.data),r!==t&&(o[st.camelCase(n)]=r),u?(a=o[n],null==a&&(a=o[st.camelCase(n)])):a=o,a}}function o(e,t,n){if(st.acceptData(e)){var r,i,o,a=e.nodeType,u=a?st.cache:e,l=a?e[st.expando]:st.expando;if(u[l]){if(t&&(r=n?u[l]:u[l].data)){st.isArray(t)?t=t.concat(st.map(t,st.camelCase)):t in r?t=[t]:(t=st.camelCase(t),t=t in r?[t]:t.split(" "));for(i=0,o=t.length;o>i;i++)delete r[t[i]];if(!(n?s:st.isEmptyObject)(r))return}(n||(delete u[l].data,s(u[l])))&&(a?st.cleanData([e],!0):st.support.deleteExpando||u!=u.window?delete u[l]:u[l]=null)}}}function a(e,n,r){if(r===t&&1===e.nodeType){var i="data-"+n.replace(Nt,"-$1").toLowerCase();if(r=e.getAttribute(i),"string"==typeof r){try{r="true"===r?!0:"false"===r?!1:"null"===r?null:+r+""===r?+r:wt.test(r)?st.parseJSON(r):r}catch(o){}st.data(e,n,r)}else r=t}return r}function s(e){var t;for(t in e)if(("data"!==t||!st.isEmptyObject(e[t]))&&"toJSON"!==t)return!1;return!0}function u(){return!0}function l(){return!1}function c(e,t){do e=e[t];while(e&&1!==e.nodeType);return e}function f(e,t,n){if(t=t||0,st.isFunction(t))return st.grep(e,function(e,r){var i=!!t.call(e,r,e);return i===n});if(t.nodeType)return st.grep(e,function(e){return e===t===n});if("string"==typeof t){var r=st.grep(e,function(e){return 1===e.nodeType});if(Wt.test(t))return st.filter(t,r,!n);t=st.filter(t,r)}return st.grep(e,function(e){return st.inArray(e,t)>=0===n})}function p(e){var t=zt.split("|"),n=e.createDocumentFragment();if(n.createElement)for(;t.length;)n.createElement(t.pop());return n}function d(e,t){return e.getElementsByTagName(t)[0]||e.appendChild(e.ownerDocument.createElement(t))}function h(e){var t=e.getAttributeNode("type");return e.type=(t&&t.specified)+"/"+e.type,e}function g(e){var t=nn.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function m(e,t){for(var n,r=0;null!=(n=e[r]);r++)st._data(n,"globalEval",!t||st._data(t[r],"globalEval"))}function y(e,t){if(1===t.nodeType&&st.hasData(e)){var n,r,i,o=st._data(e),a=st._data(t,o),s=o.events;if(s){delete a.handle,a.events={};for(n in s)for(r=0,i=s[n].length;i>r;r++)st.event.add(t,n,s[n][r])}a.data&&(a.data=st.extend({},a.data))}}function v(e,t){var n,r,i;if(1===t.nodeType){if(n=t.nodeName.toLowerCase(),!st.support.noCloneEvent&&t[st.expando]){r=st._data(t);for(i in r.events)st.removeEvent(t,i,r.handle);t.removeAttribute(st.expando)}"script"===n&&t.text!==e.text?(h(t).text=e.text,g(t)):"object"===n?(t.parentNode&&(t.outerHTML=e.outerHTML),st.support.html5Clone&&e.innerHTML&&!st.trim(t.innerHTML)&&(t.innerHTML=e.innerHTML)):"input"===n&&Zt.test(e.type)?(t.defaultChecked=t.checked=e.checked,t.value!==e.value&&(t.value=e.value)):"option"===n?t.defaultSelected=t.selected=e.defaultSelected:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}}function b(e,n){var r,i,o=0,a=e.getElementsByTagName!==t?e.getElementsByTagName(n||"*"):e.querySelectorAll!==t?e.querySelectorAll(n||"*"):t;if(!a)for(a=[],r=e.childNodes||e;null!=(i=r[o]);o++)!n||st.nodeName(i,n)?a.push(i):st.merge(a,b(i,n));return n===t||n&&st.nodeName(e,n)?st.merge([e],a):a}function x(e){Zt.test(e.type)&&(e.defaultChecked=e.checked)}function T(e,t){if(t in e)return t;for(var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Nn.length;i--;)if(t=Nn[i]+n,t in e)return t;return r}function w(e,t){return e=t||e,"none"===st.css(e,"display")||!st.contains(e.ownerDocument,e)}function N(e,t){for(var n,r=[],i=0,o=e.length;o>i;i++)n=e[i],n.style&&(r[i]=st._data(n,"olddisplay"),t?(r[i]||"none"!==n.style.display||(n.style.display=""),""===n.style.display&&w(n)&&(r[i]=st._data(n,"olddisplay",S(n.nodeName)))):r[i]||w(n)||st._data(n,"olddisplay",st.css(n,"display")));for(i=0;o>i;i++)n=e[i],n.style&&(t&&"none"!==n.style.display&&""!==n.style.display||(n.style.display=t?r[i]||"":"none"));return e}function C(e,t,n){var r=mn.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function k(e,t,n,r,i){for(var o=n===(r?"border":"content")?4:"width"===t?1:0,a=0;4>o;o+=2)"margin"===n&&(a+=st.css(e,n+wn[o],!0,i)),r?("content"===n&&(a-=st.css(e,"padding"+wn[o],!0,i)),"margin"!==n&&(a-=st.css(e,"border"+wn[o]+"Width",!0,i))):(a+=st.css(e,"padding"+wn[o],!0,i),"padding"!==n&&(a+=st.css(e,"border"+wn[o]+"Width",!0,i)));return a}function E(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=ln(e),a=st.support.boxSizing&&"border-box"===st.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=un(e,t,o),(0>i||null==i)&&(i=e.style[t]),yn.test(i))return i;r=a&&(st.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+k(e,t,n||(a?"border":"content"),r,o)+"px"}function S(e){var t=V,n=bn[e];return n||(n=A(e,t),"none"!==n&&n||(cn=(cn||st("