From 821af7da22d629b0ce21289a700cdd5a47710df4 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 28 Mar 2024 05:19:37 -0400 Subject: [PATCH 1/2] 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 2/2] 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 ```