Skip to content

Commit

Permalink
Merge pull request #18 from dokku/master
Browse files Browse the repository at this point in the history
release 0.2.2
  • Loading branch information
michaelshobbs authored Sep 16, 2016
2 parents 55ff072 + 91fccb5 commit b59ca45
Show file tree
Hide file tree
Showing 89 changed files with 13,888 additions and 13 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ example/plugins/enabled/*
example/plugins/available/remote/remote
release
build
bindata.go
17 changes: 14 additions & 3 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ All notable changes to this project will be documented in this file.

### Changed

## [0.2.2] - 2016-09-16
### Fixed
- @michaelshobbs bring back bindata.go
- @michaelshobbs updated bindata.go

### Changed
- @michaelshobbs [ci skip] documentation update pass. closes #5
- @michaelshobbs use docker 1.12.1
- @michaelshobbs use dokku fork of duplex and vendor deps. closes #16

## [0.2.1] - 2015-12-24
### Fixed
- @lalyos Fix missing newlines
Expand All @@ -34,11 +44,12 @@ All notable changes to this project will be documented in this file.

## [0.1.0] - 2014-11-02
### Fixed
- fix newline issie
- @progrium fix newline issie

### Changed
- rename to plugn
- @progrium rename to plugn

[unreleased]: https://github.com/dokku/plugn/compare/v0.2.1...HEAD
[unreleased]: https://github.com/dokku/plugn/compare/v0.2.2...HEAD
[0.2.2]: https://github.com/dokku/plugn/compare/v0.2.1...v0.2.2
[0.2.1]: https://github.com/dokku/plugn/compare/v0.1.0...v0.2.1
[0.1.0]: https://github.com/dokku/plugn/compare/ae7f4c92579ec64d7cf3d3bd76cb6207dd8d3ed9...v0.1.0
4 changes: 2 additions & 2 deletions Dockerfile.build
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM golang:1.4-cross
RUN curl -s -o - https://get.docker.com/builds/Linux/x86_64/docker-1.9.1 > /usr/local/bin/docker && chmod +x /usr/local/bin/docker
FROM golang:1.6.3
RUN curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.12.1.tgz && tar --strip-components=1 -xvzf docker-1.12.1.tgz -C /usr/local/bin
43 changes: 43 additions & 0 deletions Godeps/Godeps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions Godeps/Readme

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
NAME = plugn
HARDWARE = $(shell uname -m)
VERSION ?= 0.2.1
VERSION ?= 0.2.2
IMAGE_NAME ?= $(NAME)
BUILD_TAG ?= dev

Expand All @@ -18,7 +18,8 @@ deps:
go get -u github.com/jteeuwen/go-bindata/...
go get -u github.com/progrium/gh-release/...
go get -u github.com/progrium/basht/...
go get || true
go get -u github.com/tools/godep
godep restore

release: build
rm -rf release && mkdir release
Expand All @@ -30,7 +31,7 @@ build-in-docker:
docker build --rm -f Dockerfile.build -t $(NAME)-build .
docker run --rm -v /var/run/docker.sock:/var/run/docker.sock:ro \
-v /var/lib/docker:/var/lib/docker \
-v ${PWD}:/usr/src/myapp -w /usr/src/myapp \
-v ${PWD}:/go/src/github.com/dokku/plugn -w /go/src/github.com/dokku/plugn \
-e IMAGE_NAME=$(IMAGE_NAME) -e BUILD_TAG=$(BUILD_TAG) -e VERSION=master \
$(NAME)-build make -e deps build
docker rmi $(NAME)-build || true
Expand Down
21 changes: 19 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ Hook system that lets users extend your application with plugins

## Installation
```
wget -qO /tmp/plugn_latest.tgz https://github.com/dokku/plugn/releases/download/v0.1.0/plugn_0.1.0_linux_x86_64.tgz
tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
$ wget -qO /tmp/plugn_latest.tgz https://github.com/dokku/plugn/releases/download/v0.2.2/plugn_0.2.2_linux_x86_64.tgz
$ tar xzf /tmp/plugn_latest.tgz -C /usr/local/bin
```

## Usage
Expand All @@ -24,6 +24,7 @@ Available commands:
trigger Triggers hook in enabled plugins
uninstall Remove plugin from available plugins
update Update plugin and optionally pin to commit/tag/branch
version Show version
```

## Building & Testing (in docker)
Expand All @@ -34,6 +35,22 @@ $ make build-in-docker
$ make test
```

## Plugin directory structure example
```
ps (plugin name)
├── [-rw-r--r--] plugin.toml (metadata)
├── [-rwxr-xr-x] post-deploy (trigger)
├── [-rwxr-xr-x] post-stop (trigger)
└── [-rwxr-xr-x] pre-deploy (trigger)
```

## plugin.toml format example
```
[plugin name]
description = "plugin description"
version = "0.1.0"
```

## Releases

Anybody can propose a release. First bump the version in `Makefile`, 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.
Expand Down
Loading

0 comments on commit b59ca45

Please # to comment.