From 1a18a496b970acf343d81e345a68ae4dfb14a43b Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 20 Jan 2021 16:32:47 +0100 Subject: [PATCH 1/2] add expose to docker images --- changelog/unreleased/expose-docker-image | 7 +++++++ ocis/docker/Dockerfile.linux.amd64 | 2 ++ ocis/docker/Dockerfile.linux.arm | 2 ++ ocis/docker/Dockerfile.linux.arm64 | 2 ++ 4 files changed, 13 insertions(+) create mode 100644 changelog/unreleased/expose-docker-image diff --git a/changelog/unreleased/expose-docker-image b/changelog/unreleased/expose-docker-image new file mode 100644 index 0000000000..b330fdd3e5 --- /dev/null +++ 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 index f39451935c..a902c8597f 100644 --- a/ocis/docker/Dockerfile.linux.amd64 +++ b/ocis/docker/Dockerfile.linux.amd64 @@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH " \ 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 index 880fb57b92..5ae4306909 100644 --- a/ocis/docker/Dockerfile.linux.arm +++ b/ocis/docker/Dockerfile.linux.arm @@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH " \ 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 index c142a41a68..3750fe46ff 100644 --- a/ocis/docker/Dockerfile.linux.arm64 +++ b/ocis/docker/Dockerfile.linux.arm64 @@ -11,6 +11,8 @@ LABEL maintainer="ownCloud GmbH " \ org.label-schema.vendor="ownCloud GmbH" \ org.label-schema.schema-version="1.0" +EXPOSE 9200/tcp + ENTRYPOINT ["/usr/bin/ocis"] CMD ["server"] From afe098e5b1770accc2c074e2a81affaade765e26 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Thu, 21 Jan 2021 14:38:30 +0000 Subject: [PATCH 2/2] Automated changelog update [skip ci] --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 085bb49eaa..55b9964646 100644 --- 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