Skip to content

Commit eef3d9a

Browse files
authored
Cachet v2.2.4 release (#94)
1 parent 97886ea commit eef3d9a

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

CONTRIBUTING.md

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,23 @@ The following describes the purpose of each branch within the repository.
1515
* `1.2`: Used for tagging _v1.2.x_ releases.
1616
* `2.0`: Used for tagging _v2.0.x_ releases.
1717
* `2.1`: Used for tagging _v2.1.x_ releases.
18+
* `2.2`: Used for tagging _v2.2.x_ releases.
1819

1920
# Releasing a new Cachet version
2021

21-
The below example shows bumping to a `v2.0.4` release from `v2.0.3`.
22+
The below example shows bumping to a `v2.2.4` release from `v2.2.3`.
2223

2324
```
24-
git checkout 2.0
25-
git checkout -b rel-2.0.4
26-
sed -i s/v2.0.3/v2.0.4/g Dockerfile
27-
git commit -am "Cachet v2.0.4 release"
28-
git push origin rel-2.0.4
29-
<Submit Merge request to `2.0` branch, continue once merged>
30-
git checkout 2.0
25+
git checkout 2.2
26+
git checkout -b rel-2.2.4
27+
sed -i s/v2.2.3/v2.2.4/g Dockerfile
28+
git commit -am "Cachet v2.2.4 release"
29+
git push origin rel-2.2.4
30+
<Submit Merge request to `2.2` branch, continue once merged>
31+
git checkout 2.2
3132
git pull
32-
git tag -a v2.0.4 -m "Cachet Release v2.0.4"
33-
git push origin v2.0.4
33+
git tag -a v2.2.4 -m "Cachet Release v2.2.4"
34+
git push origin v2.2.4
3435
<Add Release on GitHub>
3536
<Add automated build for the tag on Docker Hub>
3637
```

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ WORKDIR /var/www/html/
2525
# Install composer
2626
RUN curl -sS https://getcomposer.org/installer | php
2727

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

3434
COPY docker/entrypoint.sh /sbin/entrypoint.sh

0 commit comments

Comments
 (0)