Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
tobias-kuendig committed Jul 16, 2018
2 parents 9b63b8a + b641512 commit efd8ed2
Show file tree
Hide file tree
Showing 6 changed files with 200 additions and 157 deletions.
19 changes: 19 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
FROM composer:latest

RUN mkdir /tmp/bootstrapper /build

RUN composer global require --prefer-dist laravel/envoy --no-interaction

ADD . /tmp/bootstrapper

WORKDIR /tmp/bootstrapper
RUN composer install --no-interaction --prefer-dist

RUN ln -s /tmp/bootstrapper/october /usr/bin/october
RUN ln -s /tmp/vendor/bin/envoy /usr/bin/envoy

WORKDIR /build

CMD ["/tmp/bootstrapper/october"]


10 changes: 10 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,16 @@ You can now run `october` from your command line.
```bash
$ october
October CMS Bootstrapper version 0.2.0

### Docker image

An official Docker image that bundles `oc-bootstrapper`, `composer` and `Envoy` is available on [hub.docker.com](https://hub.docker.com/r/offlinegmbh/oc-bootstrapper/) as `offlinegmbh/oc-bootstrapper`.

```
docker exec offlinegmbh/oc-bootstrapper -v
```
```

## Usage
Expand Down
10 changes: 5 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@
"require": {
"guzzlehttp/guzzle": "~6.0",
"cypresslab/gitelephant": "~2.0",
"symfony/console": "~2.7|~3.0",
"symfony/process": "~2.7|~3.0",
"symfony/filesystem": "~2.7|~3.0",
"symfony/yaml": "~2.1|~3.0"
"symfony/console": "~2.7|~3.0|~4.0",
"symfony/process": "~2.7|~3.0|~4.0",
"symfony/filesystem": "~2.7|~3.0|~4.0",
"symfony/yaml": "~2.1|~3.0|~4.0"
},
"bin": [
"october"
],
"require-dev": {
"symfony/var-dumper": "~2.7|~3.0"
"symfony/var-dumper": "~2.7|~3.0|~4.0"
}
}
Loading

0 comments on commit efd8ed2

Please sign in to comment.