Merge branch 'master' into add_volume_docker_image

owncloud · Jan 21, 2021 · 833d0e4 · 833d0e4
2 parents f21af25 + afe098e
commit 833d0e4
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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 "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)
 * 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
 
+* 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)
 
    Replaced Math.random with a cryptographically secure way to generate the oidc state token

diff --git a/changelog/unreleased/expose-docker-image b/changelog/unreleased/expose-docker-image
@@ -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
diff --git a/ocis/docker/Dockerfile.linux.amd64 b/ocis/docker/Dockerfile.linux.amd64
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
   org.label-schema.vendor="ownCloud GmbH" \
   org.label-schema.schema-version="1.0"
 
+EXPOSE 9200/tcp
+
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]
 

diff --git a/ocis/docker/Dockerfile.linux.arm b/ocis/docker/Dockerfile.linux.arm
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
   org.label-schema.vendor="ownCloud GmbH" \
   org.label-schema.schema-version="1.0"
 
+EXPOSE 9200/tcp
+
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]
 

diff --git a/ocis/docker/Dockerfile.linux.arm64 b/ocis/docker/Dockerfile.linux.arm64
@@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH <devops@owncloud.com>" \
   org.label-schema.vendor="ownCloud GmbH" \
   org.label-schema.schema-version="1.0"
 
+EXPOSE 9200/tcp
+
 ENTRYPOINT ["/usr/bin/ocis"]
 CMD ["server"]