0.0.3 • Published 8 years ago
vispa v0.0.3
VISPA
Development
Development process
We should follow a git workflow with feature and release branches, and release and release candidate tags.
Features and bugfixes
- The
masterbranch is protected and should be kept clean and up-to-date. - For features, fixes, etc, create feature branches based off the
masterbranch. - Create merge requests to merge your (tested) feautures back into the
masterbranch.
Releases
- For preparing a release, we create a
release/v<major>.<minor>branch based off themasterbranch. - Tags of commits on release branches are named
v<major>.<minor>.<patch>-<stage>, where the firstpatchnumber is 0 and thestageis typicallyrc0,rc1, etc. - Use branches prefixed with
hotfix/to fix bugs inreleasebranches. - When a release is ready to be published, we create a new tag named
v<major>.<minor>.<patch>. - The changes due to hotfixes should be added to the
masterbranch again by either- merging without fast-forwarding, or
- cherrpy-picking certain commits from
hotfixbranches.
Release and tag versioning
- Release branches:
release/v<major>.<minor> - Tag on release branches:
v<major>.<minor>.<patch>-<stage> - All other tags must not start with
v\d.
Branch naming
Except for the master branch, we should use the <purpose>/<description> convention.
purpose should be one of the following:
<username>for personal branches.featurefor feature branches.fixfor bug fixes on the master branch.releasefor final releases (withdescriptionas defined above).hotfixfor bug fixes on release branches.
Docker
You can find all images at our Docker Hub.
We provide a dedicated image containing everything to run the vispa server. This image can also be used for development:
# checkout VISPA
git checkout git@git.rwth-aachen.de:3pia/vispa.git
cd vispa
# run the server inside docker
docker run --name vispadev -ti -p 4282:4282 -v `pwd`:/vispa/repo 3pia/vispa-server--name vispadevnames the container "vispadev" so you can start and attach it later on without looking up the hash.-tiallocates a pseudo-tty and keepsstdinopen.-p 4282:4282publishes the application port (second number) to the host system (first number).-v `pwd`:/vispa/repomounts the current host directory to the container directory that is supposed to contain the vispa repository.
The container is not deleted when you stop it (no --rm parameter). If you want to reattach it to start developing again, do:
docker start vispadev && docker attach vispadevTODO
Hooks
server.setupserver.listensocket.starteddb.connection.establisheddb.models.loadeduser.register, useruser.login, userworkspace.add, workspace, user