diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8c72ede6..29f7e226 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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 - -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 + +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 ``` diff --git a/Dockerfile b/Dockerfile index 9d5f0f78..cd8ea0b5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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