From 4c5ed2dc73b8db62dbf8286460c512f603455b0d Mon Sep 17 00:00:00 2001
From: Adam <897017+aSemy@users.noreply.github.com>
Date: Sat, 8 Oct 2022 13:05:24 +0200
Subject: [PATCH] give +x to docker apps, tidy up docker conf

---
 modules/events-processors/docker/Dockerfile            | 3 ++-
 modules/events-processors/docker/docker-compose.yml    | 5 -----
 modules/events-server-syslog/docker/Dockerfile         | 3 ++-
 modules/events-server-syslog/docker/docker-compose.yml | 1 -
 modules/events-server-web/docker/Dockerfile            | 3 ++-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/modules/events-processors/docker/Dockerfile b/modules/events-processors/docker/Dockerfile
index fcc32cc..cce46b6 100644
--- a/modules/events-processors/docker/Dockerfile
+++ b/modules/events-processors/docker/Dockerfile
@@ -15,6 +15,7 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${DIST_DIR}/${APP_NAME}-${KAFKATORIO_VERSION}.tar ${APP_NAME}.tar
 
 RUN tar -xf ${APP_NAME}.tar --strip-components=1 \
- && rm ${APP_NAME}.tar
+ && rm ${APP_NAME}.tar \
+ && chmod +x /app/bin/${APP_NAME} \
 
 ENTRYPOINT /app/bin/${APP_NAME}
diff --git a/modules/events-processors/docker/docker-compose.yml b/modules/events-processors/docker/docker-compose.yml
index 87087e5..9091b44 100644
--- a/modules/events-processors/docker/docker-compose.yml
+++ b/modules/events-processors/docker/docker-compose.yml
@@ -16,11 +16,6 @@ services:
     environment:
       KAFKA_BOOTSTRAP_SERVERS: "http://kafka:29092"
       # KAFKA_STREAMS_STATE_DIR: ""
-      SERVER_PORT: "8080"
-      SOCKET_SERVER_PORT: "9002"
-    ports:
-      - "12080:8080" # http and ws
-      - "12034:9002" # syslog socket
     networks:
       - "kafka-nw"
       - "kafkatorio-nw"
diff --git a/modules/events-server-syslog/docker/Dockerfile b/modules/events-server-syslog/docker/Dockerfile
index acbdf9f..15d499c 100644
--- a/modules/events-server-syslog/docker/Dockerfile
+++ b/modules/events-server-syslog/docker/Dockerfile
@@ -19,6 +19,7 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${DIST_DIR}/${APP_NAME}-${KAFKATORIO_VERSION}.tar ${APP_NAME}.tar
 
 RUN tar -xf ${APP_NAME}.tar --strip-components=1 \
- && rm ${APP_NAME}.tar
+ && rm ${APP_NAME}.tar \
+ && chmod +x /app/bin/${APP_NAME}
 
 ENTRYPOINT /app/bin/${APP_NAME}
diff --git a/modules/events-server-syslog/docker/docker-compose.yml b/modules/events-server-syslog/docker/docker-compose.yml
index b33295c..855f34b 100644
--- a/modules/events-server-syslog/docker/docker-compose.yml
+++ b/modules/events-server-syslog/docker/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       SERVER_PORT: "8080"
       SOCKET_SERVER_PORT: "9002"
     ports:
-      - "12080:8080" # http and ws
       - "12034:9002" # syslog socket
     networks:
       - "kafka-nw"
diff --git a/modules/events-server-web/docker/Dockerfile b/modules/events-server-web/docker/Dockerfile
index e25170b..af0fafc 100644
--- a/modules/events-server-web/docker/Dockerfile
+++ b/modules/events-server-web/docker/Dockerfile
@@ -19,6 +19,7 @@ VOLUME ${SERVER_DATA_DIR} \
 COPY ${DIST_DIR}/${APP_NAME}-${KAFKATORIO_VERSION}.tar ${APP_NAME}.tar
 
 RUN tar -xf ${APP_NAME}.tar --strip-components=1 \
- && rm ${APP_NAME}.tar
+ && rm ${APP_NAME}.tar \
+ && chmod +x /app/bin/${APP_NAME}
 
 ENTRYPOINT /app/bin/${APP_NAME}