Remove oss handling in docker distribution project (#70134)

- Remove docker oss log4j properties
- Remove oss images from docker compose

Follow up on #69775
Related to #68797

distribution/docker/build.gradle

@@ -124,9 +124,7 @@ project.ext {
       if (base == DockerBase.IRON_BANK) {
         into('scripts') {
           from projectDir.resolve("src/docker/bin")
-          from(projectDir.resolve("src/docker/config")) {
-            exclude '**/oss'
-          }
+          from(projectDir.resolve("src/docker/config"))
         }
         from(projectDir.resolve("src/docker/iron_bank")) {
           expand(varExpansions)
@@ -137,10 +135,6 @@ project.ext {
         }
 
         into('config') {
-          // The OSS and default distribution can have different configuration, therefore we want to
-          // allow overriding the default configuration by creating config files in oss or default
-          // build-context sub-modules.
-          duplicatesStrategy = DuplicatesStrategy.INCLUDE
           from projectDir.resolve("src/docker/config")
         }
       }
@@ -214,15 +208,12 @@ tasks.named("preProcessFixture").configure {
     // tests expect to have an empty repo
     project.delete(
       "${buildDir}/repo",
-      "${buildDir}/oss-repo"
     )
     createAndSetWritable(
       "${buildDir}/repo",
       "${buildDir}/oss-repo",
       "${buildDir}/logs/default-1",
       "${buildDir}/logs/default-2",
-      "${buildDir}/logs/oss-1",
-      "${buildDir}/logs/oss-2"
     )
   }
 }

distribution/docker/docker-compose.yml

@@ -103,66 +103,3 @@ services:
       interval: 10s
       timeout: 2s
       retries: 5
-  elasticsearch-oss-1:
-    image: elasticsearch:test
-    environment:
-       - node.name=elasticsearch-oss-1
-       - cluster.initial_master_nodes=elasticsearch-oss-1,elasticsearch-oss-2
-       - discovery.seed_hosts=elasticsearch-oss-2:9300
-       - cluster.name=elasticsearch-oss
-       - bootstrap.memory_lock=true
-       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-       - path.repo=/tmp/es-repo
-       - node.attr.testattr=test
-       - cluster.routing.allocation.disk.watermark.low=1b
-       - cluster.routing.allocation.disk.watermark.high=1b
-       - cluster.routing.allocation.disk.watermark.flood_stage=1b
-       - node.store.allow_mmap=false
-    volumes:
-       - ./build/oss-repo:/tmp/es-repo
-       - ./build/logs/oss-1:/usr/share/elasticsearch/logs
-    ports:
-      - "9200"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    healthcheck:
-      start_period: 15s
-      test: ["CMD", "curl", "-f", "http://localhost:9200"]
-      interval: 10s
-      timeout: 2s
-      retries: 5
-  elasticsearch-oss-2:
-    image: elasticsearch:test
-    environment:
-       - node.name=elasticsearch-oss-2
-       - cluster.initial_master_nodes=elasticsearch-oss-1,elasticsearch-oss-2
-       - discovery.seed_hosts=elasticsearch-oss-1:9300
-       - cluster.name=elasticsearch-oss
-       - bootstrap.memory_lock=true
-       - "ES_JAVA_OPTS=-Xms512m -Xmx512m"
-       - path.repo=/tmp/es-repo
-       - node.attr.testattr=test
-       - cluster.routing.allocation.disk.watermark.low=1b
-       - cluster.routing.allocation.disk.watermark.high=1b
-       - cluster.routing.allocation.disk.watermark.flood_stage=1b
-       - node.store.allow_mmap=false
-    volumes:
-       - ./build/oss-repo:/tmp/es-repo
-       - ./build/logs/oss-2:/usr/share/elasticsearch/logs
-    ports:
-      - "9200"
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-    healthcheck:
-      start_period: 15s
-      test: ["CMD", "curl", "-f", "http://localhost:9200"]
-      interval: 10s
-      timeout: 2s
-      retries: 5

distribution/docker/src/docker/config/oss/log4j2.properties

@@ -1,44 +0,0 @@
-status = error
-
-appender.rolling.type = Console
-appender.rolling.name = rolling
-appender.rolling.layout.type = ECSJsonLayout
-appender.rolling.layout.dataset = elasticsearch.server
-
-rootLogger.level = info
-rootLogger.appenderRef.rolling.ref = rolling
-
-appender.header_warning.type = HeaderWarningAppender
-appender.header_warning.name = header_warning
-
-appender.deprecation_rolling.type = Console
-appender.deprecation_rolling.name = deprecation_rolling
-appender.deprecation_rolling.layout.type = ECSJsonLayout
-appender.deprecation_rolling.layout.dataset = elasticsearch.deprecation
-appender.deprecation_rolling.filter.rate_limit.type = RateLimitingFilter
-
-logger.deprecation.name = org.elasticsearch.deprecation
-logger.deprecation.level = deprecation
-logger.deprecation.appenderRef.deprecation_rolling.ref = deprecation_rolling
-logger.deprecation.appenderRef.header_warning.ref = header_warning
-logger.deprecation.additivity = false
-
-appender.index_search_slowlog_rolling.type = Console
-appender.index_search_slowlog_rolling.name = index_search_slowlog_rolling
-appender.index_search_slowlog_rolling.layout.type = ECSJsonLayout
-appender.index_search_slowlog_rolling.layout.dataset = elasticsearch.index_search_slowlog
-
-logger.index_search_slowlog_rolling.name = index.search.slowlog
-logger.index_search_slowlog_rolling.level = trace
-logger.index_search_slowlog_rolling.appenderRef.index_search_slowlog_rolling.ref = index_search_slowlog_rolling
-logger.index_search_slowlog_rolling.additivity = false
-
-appender.index_indexing_slowlog_rolling.type = Console
-appender.index_indexing_slowlog_rolling.name = index_indexing_slowlog_rolling
-appender.index_indexing_slowlog_rolling.layout.type = ECSJsonLayout
-appender.index_indexing_slowlog_rolling.layout.dataset = elasticsearch.index_indexing_slowlog
-
-logger.index_indexing_slowlog.name = index.indexing.slowlog.index
-logger.index_indexing_slowlog.level = trace
-logger.index_indexing_slowlog.appenderRef.index_indexing_slowlog_rolling.ref = index_indexing_slowlog_rolling
-logger.index_indexing_slowlog.additivity = false