Merge pull request 'discovery port name seperator from' (#40) from ch…

…angeportname into master

Reviewed-on: https://gitea:3000/AVENTER/mesos-compose/pulls/40

.version.json

@@ -1 +1 @@
-[{ "version":"v0.4.2", "builddate":"2023-08-01T06:54:08Z" }]
+[{ "version":"v0.4.2", "builddate":"2023-08-25T21:20:56Z" }]

README.md

@@ -114,7 +114,7 @@ services:
     labels:
       traefik.enable: "true"
       traefik.http.routers.test.entrypoints: "web"
-      traefik.http.routers.test.service: "mc:test:app1:80" # if an alternative taskname is set, we have to use it here to
+      traefik.http.routers.test.service: "mc_test_app1_80" # if an alternative taskname is set, we have to use it here to
       traefik.http.routers.test.rule: "HostRegexp(`example.com`, `{subdomain:[a-z]+}.example.com`)"
     network_mode: "BRIDGE"
     ports:

api/compose.go

@@ -267,7 +267,7 @@ func (e *API) getDiscoveryInfoPorts(cmd cfg.Command) []mesosproto.Port {
 	for i, c := range cmd.DockerPortMappings {
 		var tmpport mesosproto.Port
 		p := func() *string { x := cmd.TaskName + ":" + strconv.FormatUint(uint64(c.ContainerPort), 10); return &x }()
-		tmpport.Name = p
+		tmpport.Name = func() *string { x := strings.ReplaceAll(*p, ":", "_"); return &x }()
 		tmpport.Number = c.HostPort
 		tmpport.Protocol = c.Protocol
 

docs/example/fetch.yaml

@@ -0,0 +1,22 @@
+version: '3.9'
+services:
+  test1:
+    image: docker.io/avhost/docker-lighttpd
+    ports:
+      - "9999:8888/http"
+    network_mode: "bridge"
+    hostname: test.weave.local
+    network: default
+    restart: always
+    deploy:
+      replicas: 1
+    mesos:
+      fetch:
+        - value: https://downloads.mesosphere.com:8443/Dockerfile
+          executable: false
+
+networks:
+  default:
+    external: true
+    name: weave
+

docs/example/mesos-compose.yml

@@ -28,7 +28,7 @@ services:
     labels:
       traefik.enable: "true"
       traefik.http.routers.test.entrypoints: "web"
-      traefik.http.routers.test.service: "mc:test:app1:80" # if an alternative taskname is set, we have to use it here to
+      traefik.http.routers.test.service: "mc_test_app1_80" # if an alternative taskname is set, we have to use it here to
       traefik.http.routers.test.rule: "HostRegexp(`example.com`, `{subdomain:[a-z]+}.example.com`)"
     network_mode: "BRIDGE"
     ports:

docs/example/mesos.yaml

@@ -0,0 +1,11 @@
+version: '3.9'
+services:
+  test1:
+    image: avhost/docker-lighttpd
+    container_type: mesos
+
+networks:
+  default:
+    external: true
+    name: weave
+

docs/example/opensearch.yaml

@@ -9,9 +9,9 @@ services:
       bootstrap.memory_lock: false # along with the memlock settings below, disables swapping
       discovery.seed_hosts: opensearch-node1.mini,opensearch-node2.mini
       cluster.initial_master_nodes: opensearch-node1.mini,opensearch-node2.mini
-      OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m" # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
-      DISABLE_INSTALL_DEMO_CONFIG: true" # disables execution of install_demo_configuration.sh bundled with security plugin, which installs demo certificates and security configurations to OpenSearch
-      DISABLE_SECURITY_PLUGIN: true" # disables security plugin entirely in OpenSearch by setting plugins.security.disabled: true in opensearch.yml
+      OPENSEARCH_JAVA_OPTS: -Xms512m -Xmx512m # minimum and maximum Java heap size, recommend setting both to 50% of system RAM
+      DISABLE_INSTALL_DEMO_CONFIG: true # disables execution of install_demo_configuration.sh bundled with security plugin, which installs demo certificates and security configurations to OpenSearch
+      DISABLE_SECURITY_PLUGIN: true # disables security plugin entirely in OpenSearch by setting plugins.security.disabled: true in opensearch.yml
     ulimits:
       memlock:
         soft: -1

docs/example/test-extension.yaml

@@ -7,7 +7,7 @@ services:
       traefik.enable: "true"
       traefik.http.routers.test1.entrypoints: "web"
       traefik.http.routers.test1.rule: "Host(`www.example.com`)"
-      traefik.http.routers.test1.service: "mc:homepages:test1:8888"
+      traefik.http.routers.test1.service: "mc_homepages_test1_8888"
       traefik.http.services.test1.loadBalancer.healthCheck.path: "/index.html"
       traefik.http.services.test1.loadBalancer.healthCheck.interval: "10s"
       traefik.http.services.test1.loadBalancer.healthCheck.timeout: "3s"

docs/example/test-h2c.yaml

@@ -9,7 +9,7 @@ services:
       traefik.enable: "true"
       traefik.http.routers.test1.entrypoints: "web"
       traefik.http.routers.test1.rule: "Host(`www.example.com`)"
-      traefik.http.routers.test1.service: "mc:test:test1:8888"
+      traefik.http.routers.test1.service: "mc.test_test1:8888"
     network: default
     restart: always
 

docs/example/test-http.yaml

@@ -9,8 +9,8 @@ services:
     labels:
       traefik.enable: "true"
       traefik.http.routers.test1.entrypoints: "web"
-      traefik.http.routers.test1.rule: "Host(`www.blub.com`)"
-      traefik.http.routers.test1.service: "mc:test:test1:8888"
+      traefik.http.routers.test1.rule: "Host(`your.example.com`)"
+      traefik.http.routers.test1.service: "mc_test_test1_8888"
       traefik.http.services.test1.loadBalancer.healthCheck.path: "/index.html"
       traefik.http.services.test1.loadBalancer.healthCheck.interval: "10s"
       traefik.http.services.test1.loadBalancer.healthCheck.timeout: "3s"

docs/src/README.md

@@ -40,7 +40,7 @@ services:
     labels:
       traefik.enable: "true"
       traefik.http.routers.test.entrypoints: "web"
-      traefik.http.routers.test.service: "mc:test:app1:80" # if an alternative taskname is set, we have to use it here to
+      traefik.http.routers.test.service: "mc_test_app1_80" # if an alternative taskname is set, we have to use it here to
       traefik.http.routers.test.rule: "HostRegexp(`example.com`, `{subdomain:[a-z]+}.example.com`)"
     network_mode: "BRIDGE"
     ports: