diff --git a/CHANGELOG.md b/CHANGELOG.md index 65e7da2a58b653655c65c3f7d7a9947b86f74d1c..1a56e3728e431f54ffc3248c74dcf0e14555a072 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [Unreleased] + +### Added + +### Changed + +### Deprecated + +### Removed + +### Fixed + +### Security ## [0.9.2] - 2023-02-28 (Henrik tom Wörden) diff --git a/RELEASE_GUIDELINES.md b/RELEASE_GUIDELINES.md index 4a6fedb56325d4d86394bba2201fc61b55aecd46..2bb116b981c1af5de4293ce7f45b6c47d094eda7 100644 --- a/RELEASE_GUIDELINES.md +++ b/RELEASE_GUIDELINES.md @@ -24,12 +24,12 @@ guidelines of the CaosDB Project 6. Tag the latest commit of the main branch with `v<VERSION>`. -7. Delete the release branch. +7. Build the docker image according to the [`README_SETUP.md`](README_SETUP.md), + tag it as `caosdb/caosdb:<version>`, and push it to docker hub. -8. Merge the main branch back into the dev branch and set the image tag to a `-dev` version. +8. Delete the release branch. -9. Build the docker image according to the [`README_SETUP.md`](README_SETUP.md), - tag it as `caosdb/caosdb:<version>`, and push it to docker hub. +9. Merge the main branch back into the dev branch and set the image tag to a `-dev` version. 10. Update the versions for the next developement round: * `CHANGELOG.md`: Re-add the `[Unreleased]` section. diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml index e916ff17388cfa3a4e0c0ae3fb6bef3b8ff9274a..5ab322e39b9368ee575e34ca0240cee8a5e9a2d6 100644 --- a/compose/docker-compose.yml +++ b/compose/docker-compose.yml @@ -12,7 +12,7 @@ services: networks: - caosnet caosdb-server: - image: "caosdb/caosdb:0.9.2" + image: "caosdb/caosdb:0.9.2-dev" depends_on: - sqldb networks: