Skip to content

Commit

Permalink
Cachet v2.2.4 release (#94)
Browse files Browse the repository at this point in the history
  • Loading branch information
djdefi authored Jun 16, 2016
1 parent 97886ea commit eef3d9a
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 13 deletions.
21 changes: 11 additions & 10 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,23 @@ The following describes the purpose of each branch within the repository.
* `1.2`: Used for tagging _v1.2.x_ releases.
* `2.0`: Used for tagging _v2.0.x_ releases.
* `2.1`: Used for tagging _v2.1.x_ releases.
* `2.2`: Used for tagging _v2.2.x_ releases.

# Releasing a new Cachet version

The below example shows bumping to a `v2.0.4` release from `v2.0.3`.
The below example shows bumping to a `v2.2.4` release from `v2.2.3`.

```
git checkout 2.0
git checkout -b rel-2.0.4
sed -i s/v2.0.3/v2.0.4/g Dockerfile
git commit -am "Cachet v2.0.4 release"
git push origin rel-2.0.4
<Submit Merge request to `2.0` branch, continue once merged>
git checkout 2.0
git checkout 2.2
git checkout -b rel-2.2.4
sed -i s/v2.2.3/v2.2.4/g Dockerfile
git commit -am "Cachet v2.2.4 release"
git push origin rel-2.2.4
<Submit Merge request to `2.2` branch, continue once merged>
git checkout 2.2
git pull
git tag -a v2.0.4 -m "Cachet Release v2.0.4"
git push origin v2.0.4
git tag -a v2.2.4 -m "Cachet Release v2.2.4"
git push origin v2.2.4
<Add Release on GitHub>
<Add automated build for the tag on Docker Hub>
```
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ WORKDIR /var/www/html/
# Install composer
RUN curl -sS https://getcomposer.org/installer | php

RUN wget https://github.com/cachethq/Cachet/archive/v2.2.0.tar.gz && \
tar xzvf v2.2.0.tar.gz --strip-components=1 && \
RUN wget https://github.com/cachethq/Cachet/archive/v2.2.4.tar.gz && \
tar xzvf v2.2.4.tar.gz --strip-components=1 && \
chown -R www-data /var/www/html && \
rm -r v2.2.0.tar.gz && \
rm -r v2.2.4.tar.gz && \
php composer.phar install --no-dev -o

COPY docker/entrypoint.sh /sbin/entrypoint.sh
Expand Down

0 comments on commit eef3d9a

Please sign in to comment.