This is an automated email from the ASF dual-hosted git repository. krisden pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push: new 4f6730e KNOX-2263 - Docker - make sure not to put anything except version in the tag (#279) 4f6730e is described below commit 4f6730e31984421ee28c0951a45adf0f9f341f91 Author: Kevin Risden <risd...@users.noreply.github.com> AuthorDate: Thu Mar 5 12:22:28 2020 -0500 KNOX-2263 - Docker - make sure not to put anything except version in the tag (#279) Signed-off-by: Kevin Risden <kris...@apache.org> --- gateway-docker/pom.xml | 7 ++++--- gateway-docker/src/main/resources/docker-compose.yml | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gateway-docker/pom.xml b/gateway-docker/pom.xml index 1b96f88..9348e5a 100644 --- a/gateway-docker/pom.xml +++ b/gateway-docker/pom.xml @@ -94,7 +94,6 @@ <version>${dockerfile-maven-plugin.version}</version> <configuration> <contextDirectory>${project.build.outputDirectory}/docker</contextDirectory> - <repository>apache/knox</repository> <buildArgs> <RELEASE_FILE>knox-${project.version}.zip</RELEASE_FILE> </buildArgs> @@ -108,7 +107,8 @@ <goal>tag</goal> </goals> <configuration> - <tag>gateway-${project.version}</tag> + <repository>apache/knox-gateway</repository> + <tag>${project.version}</tag> <buildArgs> <ENTRYPOINT>gateway-entrypoint.sh</ENTRYPOINT> <EXPOSE_PORT>8443</EXPOSE_PORT> @@ -123,7 +123,8 @@ <goal>tag</goal> </goals> <configuration> - <tag>ldap-${project.version}</tag> + <repository>apache/knox-demo-ldap</repository> + <tag>${project.version}</tag> <buildArgs> <ENTRYPOINT>ldap-entrypoint.sh</ENTRYPOINT> <EXPOSE_PORT>33389</EXPOSE_PORT> diff --git a/gateway-docker/src/main/resources/docker-compose.yml b/gateway-docker/src/main/resources/docker-compose.yml index 6ff4ed3..4c4467d 100644 --- a/gateway-docker/src/main/resources/docker-compose.yml +++ b/gateway-docker/src/main/resources/docker-compose.yml @@ -16,13 +16,13 @@ version: '3' services: ldap: - image: apache/knox:ldap-1.4.0-SNAPSHOT + image: apache/knox-demo-ldap:1.4.0-SNAPSHOT ports: - "33389:33389" gateway: depends_on: - ldap - image: apache/knox:gateway-1.4.0-SNAPSHOT + image: apache/knox-gateway:1.4.0-SNAPSHOT ports: - "8443:8443"