Skip to content

Commit 129fdc8

Browse files
josegonzalezjosegonzalez
committed
Update plugin to note that this isn't needed in 0.4.x
Honestly, also not needed in 0.3.x, as you could manually set the buildpack url and create a .buildpacks file... Closes pauldub#7
1 parent 89cd5f1 commit 129fdc8

8 files changed

Lines changed: 98 additions & 30 deletions

File tree

‎.editorconfig‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
root = true
2+
3+
[*]
4+
insert_final_newline = true
5+
indent_style = space
6+
indent_size = 2
7+
8+
[Makefile]
9+
insert_final_newline = true
10+
indent_style = tab
11+
indent_size = 4
12+
13+
[*.mk]
14+
insert_final_newline = true
15+
indent_style = tab
16+
indent_size = 4

‎.travis.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
sudo: required
2+
language: bash
3+
env:
4+
- DOKKU_VERSION=master
5+
before_install: make setup
6+
script: make test

‎LICENSE.txt‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2013 Paul d'Hubert
2+
3+
Permission is hereby granted, free of charge, to any person obtaining a copy
4+
of this software and associated documentation files (the "Software"), to deal
5+
in the Software without restriction, including without limitation the rights
6+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7+
copies of the Software, and to permit persons to whom the Software is
8+
furnished to do so, subject to the following conditions:
9+
10+
The above copyright notice and this permission notice shall be included in
11+
all copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.

‎Makefile‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
shellcheck:
2+
ifeq ($(shell shellcheck > /dev/null 2>&1 ; echo $$?),127)
3+
ifeq ($(shell uname),Darwin)
4+
brew install shellcheck
5+
else
6+
sudo add-apt-repository 'deb http://archive.ubuntu.com/ubuntu trusty-backports main restricted universe multiverse'
7+
sudo apt-get update -qq && sudo apt-get install -qq -y shellcheck
8+
endif
9+
endif
10+
11+
bats:
12+
ifeq ($(shell bats > /dev/null 2>&1 ; echo $$?),127)
13+
ifeq ($(shell uname),Darwin)
14+
brew install shellcheck
15+
else
16+
sudo add-apt-repository ppa:duggan/bats --yes
17+
sudo apt-get update -qq && sudo apt-get install -qq -y bats
18+
endif
19+
endif
20+
21+
ci-dependencies: shellcheck bats
22+
23+
lint:
24+
# these are disabled due to their expansive existence in the codebase. we should clean it up though
25+
# SC2046: Quote this to prevent word splitting. - https://github.com/koalaman/shellcheck/wiki/SC2046
26+
# SC2068: Double quote array expansions, otherwise they're like $* and break on spaces. - https://github.com/koalaman/shellcheck/wiki/SC2068
27+
# SC2086: Double quote to prevent globbing and word splitting - https://github.com/koalaman/shellcheck/wiki/SC2086
28+
@echo linting...
29+
@$(QUIET) find ./ -maxdepth 1 -not -path '*/\.*' | xargs file | egrep "shell|bash" | awk '{ print $$1 }' | sed 's/://g' | xargs shellcheck -e SC2046,SC2068,SC2086
30+
31+
setup:
32+
$(MAKE) ci-dependencies
33+
34+
test: setup lint

‎README.md‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,25 @@
1-
#dokku-multi-buildpack
1+
# #dokku-multi-buildpack [![Build Status](https://img.shields.io/travis/alexpauldub/dokku-multi-buildpack.svg?branch=master "Build Status")](https://travis-ci.org/pauldub/dokku-multi-buildpack)
22

3-
dokku-multi-buildpack is a plugin for [dokku][dokku] that injects
4-
[https://github.com/ddollar/heroku-buildpack-multi][heroku-buildpack-multi] to buildstep and allows you to user more buildpacks.
3+
dokku-multi-buildpack is a plugin for [dokku](https://github.com/progrium/dokku) that injects
4+
[heroku-buildpack-multi](https://github.com/ddollar/heroku-buildpack-multi) to buildstep and allows you to use more buildpacks.
55

6-
## Installation
6+
## requirements
77

8-
```sh
9-
git clone https://github.com/pauldub/dokku-multi-buildpack.git /var/lib/dokku/plugins/dokku-multi-buildpack
10-
```
8+
- dokku 0.3.0+ (0.4.x has this functionality built-in)
9+
- docker 1.6.x+
10+
11+
## installation
1112

12-
All future deployments will use supervisord to start all processes.
13+
```shell
14+
# on 0.3.x
15+
cd /var/lib/dokku/plugins
16+
git clone https://github.com/pauldub/dokku-multi-buildpack.git dokku-multi-buildpack
17+
dokku plugins-install
18+
```
1319

1420
## License
1521

1622
The MIT License (MIT)
1723

18-
Copyright (c) 2013 Paul d'Hubert
19-
20-
Permission is hereby granted, free of charge, to any person obtaining a copy
21-
of this software and associated documentation files (the "Software"), to deal
22-
in the Software without restriction, including without limitation the rights
23-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
24-
copies of the Software, and to permit persons to whom the Software is
25-
furnished to do so, subject to the following conditions:
26-
27-
The above copyright notice and this permission notice shall be included in
28-
all copies or substantial portions of the Software.
29-
30-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
31-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
32-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
33-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
34-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
35-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
36-
SOFTWARE.
37-
3824
[dokku]: https://github.com/progrium/dokku
3925
[super]: http://supervisord.org

‎plugin.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[plugin]
2+
description = "injects heroku-buildpack-multi into your dokku deploys"
3+
version = "1.0.0"
4+
[plugin.config]

‎pre-build‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
#!/bin/bash
2-
APP="$1"; IMAGE=dokku/"$1"
1+
#!/usr/bin/env bash
2+
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
3+
4+
APP="$1"; IMAGE=dokku/"$APP"
35

46
echo "-----> Injecting heroku-multi-buildpack ..."
57

‎pre-build-buildpack‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pre-build

0 commit comments

Comments
 (0)