exasol · ckunki · Jul 4, 2023 · Jun 22, 2023 · Jun 22, 2023 · Jun 22, 2023
diff --git a/doc/changes/changes_2.0.0.md b/doc/changes/changes_2.0.0.md
@@ -26,3 +26,4 @@ If you need further versions, please open an issue.
 
 * #329: Added CLI option `--ssh-port-forward` to forward SSH port
 * #343: Added SshInfo to DatabaseInfo containing user, port and path to SSH key file
+* #308: Unified ports for database, BucketFS, and SSH
diff --git a/doc/user_guide/user_guide.rst b/doc/user_guide/user_guide.rst
@@ -244,8 +244,8 @@ The following config files are available:
 
       # Database IP in environment docker network
       export ITDE_DATABASE_HOST=172.21.0.2
-      export ITDE_DATABASE_DB_PORT=8888
-      export ITDE_DATABASE_BUCKETFS_PORT=6583
+      export ITDE_DATABASE_DB_PORT=8563
+      export ITDE_DATABASE_BUCKETFS_PORT=2580
       export ITDE_DATABASE_SSH_PORT=22
       export ITDE_DATABASE_CONTAINER_NAME=db_container_test
       export ITDE_DATABASE_CONTAINER_NETWORK_ALIASES="exasol_test_database db_container_test"

diff --git a/docker_db_config_template/7.0.0/EXAConf b/docker_db_config_template/7.0.0/EXAConf
@@ -5,7 +5,7 @@
     Platform = Docker
     LicenseFile = /exa/etc/license.xml
     CoredPort = 10001
-    SSHPort = 22
+    SSHPort = {{ ssh_port }}
     XMLRPCPort = 443
     AuthenticationToken = WG9JQkZYb0R5T1pIcWZPWTpyUHFsR3V6QUFkV1FQbHZmdm91cXJDYmNQTFl4eE1vRlZ6VnhxamdxYnpxUGRkZEhtR2NJaVVGbEpsb2NnbnRZ
     # List of networks for this cluster: 'private' is mandatory, 'public' is optional.
@@ -74,8 +74,6 @@
     Name = n11
     UUID = A5F8F92113A34BA4B0A48D5397423BBA5CF95161
     DockerVolume = n11
-    # Ports to be exposed (container : host)
-    ExposedPorts = 8888:8899, 6583:6594
     [[Disk : disk1]]
         Component = exastorage
         Devices = dev.1
@@ -121,7 +119,7 @@
     Version = {{ db_version }}
     # Memory size over all nodes (e. g. '1 TiB').
     MemSize = {{ mem_size }}
-    Port = 8888
+    Port = {{ db_port }}
     # User and group IDs that own this database (e. g. '1000:1005').
     Owner = 500 : 500
     # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any).
@@ -155,7 +153,7 @@
 [BucketFS : bfsdefault]
     Owner = 500:500
     # HTTP port number (0 = disabled)
-    HttpPort = 6583
+    HttpPort = {{ bucketfs_port }}
     # HTTPS port number (0 = disabled)
     HttpsPort = 0
     SyncKey = OGhvcmxrTnluTlFrZTV3RVBTWG5Idlc4bkVMQUNxcWs=

diff --git a/docker_db_config_template/7.1.0/EXAConf b/docker_db_config_template/7.1.0/EXAConf
@@ -5,7 +5,7 @@
     Platform = Docker
     LicenseFile = /exa/etc/license.xml
     CoredPort = 10001
-    SSHPort = 22
+    SSHPort = {{ ssh_port }}
     XMLRPCPort = 443
     WebUIBackendPort = 4444
     WebUIDomain = exacluster.local
@@ -88,8 +88,6 @@
     Affinity = 11
     UUID = 02F4E2AF9C294CABA0A119A89AC60B44EC95D19C
     DockerVolume = n11
-    # Ports to be exposed (container : host)
-    ExposedPorts = 8888:8899, 6583:6594
     [[Disk : disk1]]
         Component = exastorage
         Devices = dev.1
@@ -135,7 +133,7 @@
     Version = {{ db_version }}
     # Memory size over all nodes (e. g. '1 TiB').
     MemSize = {{ mem_size }}
-    Port = 8888
+    Port = {{ db_port }}
     # User and group IDs that own this database (e. g. '1000:1005').
     Owner = 500 : 500
     # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any).
@@ -172,7 +170,7 @@
 [BucketFS : bfsdefault]
     Owner = 500 : 500
     # HTTP port number (0 = disabled)
-    HttpPort = 6583
+    HttpPort = {{ bucketfs_port }}
     # HTTPS port number (0 = disabled)
     HttpsPort = 0
     SyncKey = c3RxWjRxWUFpZUFQblEyc0p2djZUM0VZamVZa1M0bUs=

diff --git a/docker_db_config_template/8.17.0/EXAConf b/docker_db_config_template/8.17.0/EXAConf
@@ -5,7 +5,7 @@
     Platform = Docker
     LicenseFile = /exa/etc/license.exasol_license
     CoredPort = 325
-    SSHPort = 22
+    SSHPort = {{ ssh_port }}
     IssueTracker = Jira
     XMLRPCPort = 443
     WebUIBackendPort = 4444
@@ -104,8 +104,6 @@
     Affinity = 11
     UUID = F0EA64D47F374A00B0530772981C559EE1C59086
     DockerVolume = n11
-    # Ports to be exposed (container : host)
-    ExposedPorts = 8888:8899, 6583:6594
     [[Disk : disk1]]
         Component = exastorage
         Devices = dev.1
@@ -159,7 +157,7 @@
     Version = {{ db_version }}
     # Memory size over all nodes (e. g. '1 TiB').
     MemSize = {{ mem_size }}
-    Port = 8888
+    Port = {{ db_port }}
     # User and group IDs that own this database (e. g. '1000:1005').
     Owner = 500 : 500
     # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any).
@@ -198,7 +196,7 @@
 [BucketFS : bfsdefault]
     Owner = 500 : 500
     # HTTP port number (0 = disabled)
-    HttpPort = 6583
+    HttpPort = {{ bucketfs_port }}
     # HTTPS port number (0 = disabled)
     HttpsPort = 0
     SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ=

diff --git a/docker_db_config_template/8.18.1/EXAConf b/docker_db_config_template/8.18.1/EXAConf
@@ -5,7 +5,7 @@
     Platform = Docker
     LicenseFile = /exa/etc/license.exasol_license
     CoredPort = 325
-    SSHPort = 22
+    SSHPort = {{ ssh_port }}
     IssueTracker = Jira
     XMLRPCPort = 443
     WebUIBackendPort = 4444
@@ -104,8 +104,10 @@
     Affinity = 11
     UUID = F0EA64D47F374A00B0530772981C559EE1C59086
     DockerVolume = n11
+    # Commented out exposed ports as these are only used by
+    # https://github.com/exasol/docker-db/
     # Ports to be exposed (container : host)
-    ExposedPorts = 8888:8899, 6583:6594
+    # ExposedPorts = {{ db_port }}:8899, {{ bucketfs_port }}:6594
     [[Disk : disk1]]
         Component = exastorage
         Devices = dev.1
@@ -159,7 +161,7 @@
     Version = {{ db_version }}
     # Memory size over all nodes (e. g. '1 TiB').
     MemSize = {{ mem_size }}
-    Port = 8888
+    Port = {{ db_port }}
     # User and group IDs that own this database (e. g. '1000:1005').
     Owner = 500 : 500
     # Comma-separated list of node IDs for this DB (put reserve nodes at the end, if any).
@@ -200,7 +202,7 @@
 [BucketFS : bfsdefault]
     Owner = 500 : 500
     # HTTP port number (0 = disabled)
-    HttpPort = 6583
+    HttpPort = {{ bucketfs_port }}
     # HTTPS port number (0 = disabled)
     HttpsPort = 0
     SyncKey = bDRYa3pCNXRwaW9OR3k2NjJ2TGpyQ3YweXZEOVUyanQ=

diff --git a/exasol_integration_test_docker_environment/cli/cli.py b/exasol_integration_test_docker_environment/cli/cli.py
@@ -17,7 +17,7 @@ def cli():
         Spawn an ITDE test environment:
 
             $ itde spawn-test-environment --environment-name test \\
-            --database-port-forward 8888 --bucketfs-port-forward 6666 \\
+            --database-port-forward 8563 --bucketfs-port-forward 2580 \\
             --docker-db-image-version 7.1.9 --db-mem-size 4GB
     """
     pass
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.0/EXAConf
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.1/EXAConf
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.10/EXAConf
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.11/EXAConf
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.12/EXAConf
diff --git a/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf b/exasol_integration_test_docker_environment/docker_db_config/7.0.13/EXAConf
Original file line number	Diff line number	Diff line change
Expand Up		@@ -26,3 +26,4 @@ If you need further versions, please open an issue.

		* #329: Added CLI option `--ssh-port-forward` to forward SSH port
		* #343: Added SshInfo to DatabaseInfo containing user, port and path to SSH key file
		* #308: Unified ports for database, BucketFS, and SSH