Skip to content

Commit 04ef17b

Browse files
committed
Merge pull request #21 from gliderlabs/master
v0.3.0
2 parents b8aa09c + 9ddce04 commit 04ef17b

File tree

350 files changed

+292
-1349
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

350 files changed

+292
-1349
lines changed

.dockerignore

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.git
2+
.cache
3+
tests
4+
buildpacks

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@ release
22
build
33
.cache
44
include/cedarish.txt
5-
bindata.go
5+
include/buildpacks.txt
6+
bindata.go

CHANGELOG.md

+24-2

Dockerfile

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
FROM progrium/cedarish:latest
2+
RUN curl https://github.com/gliderlabs/herokuish/releases/download/v0.3.0/herokuish_0.3.0_linux_x86_64.tgz \
3+
--silent -L | tar -xzC /bin
4+
RUN /bin/herokuish buildpack install \
5+
&& ln -s /bin/herokuish /build \
6+
&& ln -s /bin/herokuish /start \
7+
&& ln -s /bin/herokuish /exec

Dockerfile.dev

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
FROM progrium/cedarish:latest
2+
COPY ./build/linux/herokuish /bin/herokuish
3+
RUN /bin/herokuish buildpack install \
4+
&& ln -s /bin/herokuish /build \
5+
&& ln -s /bin/herokuish /start \
6+
&& ln -s /bin/herokuish /exec

Makefile

+17-16
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,32 @@
11
NAME=herokuish
22
HARDWARE=$(shell uname -m)
3-
VERSION=0.2.0
4-
CEDARISH=v2
3+
VERSION=0.3.0
54

65
build:
7-
echo "$(CEDARISH)" > include/cedarish.txt
6+
cat buildpacks/*/buildpack* | sed 'N;s/\n/ /' > include/buildpacks.txt
87
go-bindata include
98
mkdir -p build/linux && GOOS=linux go build -ldflags "-X main.Version $(VERSION)" -o build/linux/$(NAME)
109
mkdir -p build/darwin && GOOS=darwin go build -ldflags "-X main.Version $(VERSION)" -o build/darwin/$(NAME)
11-
12-
deps: .cache/cedarish_$(CEDARISH).tgz
10+
ifeq ($(CIRCLECI),true)
11+
docker build -t $(NAME):dev .
12+
else
13+
docker build -f Dockerfile.dev -t $(NAME):dev .
14+
endif
15+
16+
deps:
17+
docker pull progrium/cedarish:latest
1318
go get -u github.com/jteeuwen/go-bindata/...
1419
go get -u github.com/progrium/gh-release/...
20+
go get -u github.com/progrium/basht/...
1521
go get || true
1622

17-
.cache/cedarish_$(CEDARISH).tgz:
18-
mkdir -p .cache
19-
curl -L https://github.com/progrium/cedarish/releases/download/$(CEDARISH)/cedarish-cedar14_$(CEDARISH).tar.gz \
20-
> .cache/cedarish_$(CEDARISH).tgz
21-
22-
test: test-functional test-apps
23-
24-
test-functional: build
25-
tests/shunit2 tests/*/tests.sh
23+
test:
24+
basht tests/*/tests.sh
2625

27-
test-apps: build
28-
tests/shunit2 tests/apps/*/tests.sh
26+
circleci:
27+
docker version
28+
rm ~/.gitconfig
29+
mv Dockerfile.dev Dockerfile
2930

3031
release: build
3132
rm -rf release && mkdir release

README.md

+41-13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-clojure
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v63
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"

buildpacks/buildpack-go/buildpack-url

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
b261aab
File renamed without changes.
File renamed without changes.
+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-gradle
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v12
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-grails
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
1ef927d
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-java
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-multi
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
cddec34
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-nodejs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v64
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-php
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v57
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-play
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v23
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
https://github.com/heroku/heroku-buildpack-python
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
v53
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
source "$(dirname $BASH_SOURCE)/../../../test"
2+
app-test "$(basename $(dirname $BASH_SOURCE))"

0 commit comments

Comments
 (0)