Skip to content
This repository has been archived by the owner on Mar 29, 2021. It is now read-only.

Commit

Permalink
Update changelog for release
Browse files Browse the repository at this point in the history
  • Loading branch information
hxtree committed May 11, 2020
1 parent d88c609 commit a977347
Show file tree
Hide file tree
Showing 3 changed files with 35 additions and 14 deletions.
6 changes: 0 additions & 6 deletions .github/workflows/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@
* Test your changes using `composer test`.
* Send a pull request.

# Releases
All releases should adhere to [SemVer](https://semver.org/) naming convention.
* MAJOR version when you make incompatible API changes,
* MINOR version when you add functionality in a backwards compatible manner, and
* PATCH version when you make backwards compatible bug fixes.

## Coding Guidelines

* LivingMarkup uses Laminas Framework (formally Zend Framework).
Expand Down
26 changes: 20 additions & 6 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,26 @@
# Changelog for LivingMarkup

## LivingMarkup 1.4.2
Released: 2019-04-29. Notable changes:
* Added: Separate Core and Custom Modules
* Moved: Examples into Public Help
* Fixed: PHP Unit Test
All releases must adhere to [SemVer 2](https://semver.org/) naming convention and should adhere to [KeepAChangeLog](https://keepachangelog.com/en/1.0.0/) guidelines.

>MAJOR version - when you make incompatible API changes,
>
>MINOR version - when you add functionality in a backwards compatible manner, and
>
>PATCH version - when you make backwards compatible bug fixes.
## LivingMarkup [Unreleased]

## LivingMarkup 1.5.0
Released: 2019-05-11. Notable changes:
* Added: Separate Core and Custom Modules [#e42fc61](https://github.com/hxtree/LivingMarkup/commit/e42fc61e2773e58e51e2e2da43b29ef2cb2e9b59)
* Added: Docker build option [#173059f](https://github.com/hxtree/LivingMarkup/commit/173059fbff37430cdd805be0ba06f8fbd8b099b6)
* Added: Bootstrap and Jquery [#3d5104f](https://github.com/hxtree/LivingMarkup/commit/3d5104f395115c9f5d48ec08e87b1474171e8410)
* Added: Sass Auto Compiler [#06fe0d3](https://github.com/hxtree/LivingMarkup/commit/06fe0d364545dbac2885c6ea53576e4a55cfc07d)
* Moved: Examples into Public Help [#e42fc61](https://github.com/hxtree/LivingMarkup/commit/e42fc61e2773e58e51e2e2da43b29ef2cb2e9b59)
* Fixed: PHP Unit Test [#e4826dd](https://github.com/hxtree/LivingMarkup/commit/e4826dd3de6ada117dbe3db5089bf9fc2f2bdd9e)
* Added: Router [#89679f1](https://github.com/hxtree/LivingMarkup/commit/89679f16f8cbffa90a8f0490adb97cb30edd89e3)

## LivingMarkup 1.4.1
Released: 2019-03-29. Notable changes:

* Updated: Begin using Semantic Versioning [#74724ce](https://github.com/hxtree/LivingMarkup/commit/00c7ad18fe09465c864a6bb5a20618fbd7ce8e83)
* Updated: Started following Semantic Versioning 2 properly [#74724ce](https://github.com/hxtree/LivingMarkup/commit/00c7ad18fe09465c864a6bb5a20618fbd7ce8e83)
17 changes: 15 additions & 2 deletions docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,27 @@ arg_1="$1"
arg_2="$2"
arg_3="$3"

# should add a start prod

if [ "$arg_1" == "start" ] ; then
echo "Build webserver container"
docker build -t livingmarkup -f docker/Dockerfile .
docker run -p 80:80 -p 443:443 --name livingmarkup --volume $(pwd):/var/www -d livingmarkup
if [ "$arg_2" == "prod" ] ; then
echo "Run webserver for production"
docker run -p 80:80 -p 443:443 --name livingmarkup --volume $(pwd):/var/www -d livingmarkup
else
# mount local volume for rapid development
echo "Run webserver for development"
docker run -p 80:80 -p 443:443 --name livingmarkup --volume $(pwd):/var/www -d livingmarkup
fi
elif [ "$arg_1" == "stop" ] ; then
echo "Stop webserver container"
docker stop livingmarkup
echo "Remove webserver container"
docker rm livingmarkup
elif [ "$arg_1" == "shell" ]; then
docker exec -it livingmarkup bash
echo "Exec into webserver"
docker exec -it livingmarkup bash,
else
echo "Pass argument 'stop' or 'start'"
fi
Expand Down

0 comments on commit a977347

Please sign in to comment.