diff --git a/docker/containers/tactical-nats/dockerfile b/docker/containers/tactical-nats/dockerfile index 4e4cda8b..a2a7f8df 100644 --- a/docker/containers/tactical-nats/dockerfile +++ b/docker/containers/tactical-nats/dockerfile @@ -7,9 +7,6 @@ RUN apk add --no-cache inotify-tools supervisor bash SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] -COPY natsapi/bin/nats-api /usr/local/bin/ -RUN chmod +x /usr/local/bin/nats-api - COPY docker/containers/tactical-nats/entrypoint.sh / RUN chmod +x /entrypoint.sh diff --git a/docker/containers/tactical-nats/entrypoint.sh b/docker/containers/tactical-nats/entrypoint.sh index 3bb062aa..a9f3bef8 100644 --- a/docker/containers/tactical-nats/entrypoint.sh +++ b/docker/containers/tactical-nats/entrypoint.sh @@ -2,15 +2,6 @@ set -e -: "${DEV:=0}" -: "${API_CONTAINER:=tactical-backend}" -: "${API_PORT:=80}" - -if [ "${DEV}" = 1 ]; then - NATS_CONFIG=/workspace/api/tacticalrmm/nats-rmm.conf -else - NATS_CONFIG="${TACTICAL_DIR}/api/nats-rmm.conf" -fi sleep 15 until [ -f "${TACTICAL_READY_FILE}" ]; do echo "waiting for init container to finish install or update..." @@ -38,11 +29,6 @@ stdout_logfile=/dev/fd/1 stdout_logfile_maxbytes=0 redirect_stderr=true -[program:nats-api] -command=/bin/bash -c "/usr/local/bin/nats-api -debug -api-host http://${API_CONTAINER}:${API_PORT}/natsapi -nats-host tls://${API_HOST}:4222" -stdout_logfile=/dev/fd/1 -stdout_logfile_maxbytes=0 -redirect_stderr=true EOF )" diff --git a/docker/containers/tactical/dockerfile b/docker/containers/tactical/dockerfile index 3187d476..74a9a553 100644 --- a/docker/containers/tactical/dockerfile +++ b/docker/containers/tactical/dockerfile @@ -58,6 +58,10 @@ SHELL ["/bin/bash", "-e", "-o", "pipefail", "-c"] COPY api/tacticalrmm/core/goinstaller/bin/goversioninfo /usr/local/bin/goversioninfo RUN chmod +x /usr/local/bin/goversioninfo +# copy nats-api file +COPY natsapi/bin/nats-api /usr/local/bin/ +RUN chmod +x /usr/local/bin/nats-api + # docker init COPY docker/containers/tactical/entrypoint.sh / RUN chmod +x /entrypoint.sh