Merge branch 'master' into add_log_rotation_deploy_examples

2021-01-21 17:18:52 +01:00
parent 623f98d989 e528631733
commit 1418961a8b
5 changed files with 23 additions and 0 deletions
@@ -7,6 +7,7 @@ The following sections list the changes for unreleased.
 ## Summary

 * Change - Disable pretty logging by default: [#1133](https://github.com/owncloud/ocis/pull/1133)
+* Change - Add "volume" declaration to docker images: [#1375](https://github.com/owncloud/ocis/pull/1375)
 * Change - Add "expose" information to docker images: [#1366](https://github.com/owncloud/ocis/pull/1366)
 * Change - Generate cryptographically secure state token: [#1203](https://github.com/owncloud/ocis/pull/1203)
 * Change - Move k6 to cdperf: [#1358](https://github.com/owncloud/ocis/pull/1358)
@@ -27,6 +28,15 @@ The following sections list the changes for unreleased.

   https://github.com/owncloud/ocis/pull/1133

+* Change - Add "volume" declaration to docker images: [#1375](https://github.com/owncloud/ocis/pull/1375)
+
+   Tags: docker
+
+   Add "volume" declaration to docker images. This makes it easier for Docker users to see where
+   oCIS stores data.
+
+   https://github.com/owncloud/ocis/pull/1375
+
 * Change - Add "expose" information to docker images: [#1366](https://github.com/owncloud/ocis/pull/1366)

   Tags: docker
@@ -0,0 +1,7 @@
+Change: Add "volume" declaration to docker images
+
+Tags: docker
+
+Add "volume" declaration to docker images. This makes it easier for Docker users to see where oCIS stores data.
+
+https://github.com/owncloud/ocis/pull/1375
@@ -17,3 +17,5 @@ ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

 COPY bin/ocis /usr/bin/ocis
+
+VOLUME [ "/var/tmp/ocis" ]
@@ -17,3 +17,5 @@ ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

 COPY bin/ocis /usr/bin/ocis
+
+VOLUME [ "/var/tmp/ocis" ]
@@ -17,3 +17,5 @@ ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]

 COPY bin/ocis /usr/bin/ocis
+
+VOLUME [ "/var/tmp/ocis" ]