Merge branch 'master' into add_volume_docker_image

This commit is contained in:
Willy Kloucek
2021-01-21 16:00:03 +01:00
committed by GitHub
5 changed files with 23 additions and 0 deletions
+10
View File
@@ -7,6 +7,7 @@ The following sections list the changes for unreleased.
## Summary ## Summary
* Change - Disable pretty logging by default: [#1133](https://github.com/owncloud/ocis/pull/1133) * Change - Disable pretty logging by default: [#1133](https://github.com/owncloud/ocis/pull/1133)
* 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 - 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) * Change - Move k6 to cdperf: [#1358](https://github.com/owncloud/ocis/pull/1358)
* Change - Update go version: [#1364](https://github.com/owncloud/ocis/pull/1364) * Change - Update go version: [#1364](https://github.com/owncloud/ocis/pull/1364)
@@ -26,6 +27,15 @@ The following sections list the changes for unreleased.
https://github.com/owncloud/ocis/pull/1133 https://github.com/owncloud/ocis/pull/1133
* Change - Add "expose" information to docker images: [#1366](https://github.com/owncloud/ocis/pull/1366)
Tags: docker
Add "expose" information to docker images. Docker users will now see that we offer services on
port 9200.
https://github.com/owncloud/ocis/pull/1366
* Change - Generate cryptographically secure state token: [#1203](https://github.com/owncloud/ocis/pull/1203) * Change - Generate cryptographically secure state token: [#1203](https://github.com/owncloud/ocis/pull/1203)
Replaced Math.random with a cryptographically secure way to generate the oidc state token Replaced Math.random with a cryptographically secure way to generate the oidc state token
+7
View File
@@ -0,0 +1,7 @@
Change: Add "expose" information to docker images
Tags: docker
Add "expose" information to docker images. Docker users will now see that we offer services on port 9200.
https://github.com/owncloud/ocis/pull/1366
+2
View File
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]
+2
View File
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]
+2
View File
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.vendor="ownCloud GmbH" \
org.label-schema.schema-version="1.0" org.label-schema.schema-version="1.0"
EXPOSE 9200/tcp
ENTRYPOINT ["/usr/bin/ocis"] ENTRYPOINT ["/usr/bin/ocis"]
CMD ["server"] CMD ["server"]