25: docker compose (#27)

* 25: Adds docker-compose build

* 25: Trims URI cmdline arg strings

Author: cybtachyon

Dockerfile

@@ -21,6 +21,10 @@ RUN sudo dnf update --assumeyes --verbose && dnf install --assumeyes --verbose \
   && dnf clean all \
   && rm -rf /var/cache/yum
 
+COPY CMakeLists.txt /tmp/srt-game-server/
+COPY config.yaml /tmp/srt-game-server/
+COPY src/ /tmp/srt-game-server/src/
+
 WORKDIR /tmp/srt-game-server/src/Proto
 RUN for i in `ls -lC1 *.proto`; do `echo protoc $i --cpp_out=.`; done; mkdir /tmp/build
 WORKDIR /tmp/build
@@ -54,9 +58,9 @@ ENV USER_UID=1000
 ENV USER_NAME=srt
 ENV EXECUTABLE_NAME=srt-game-server.bin
 ENV EXECUTABLE=/home/${USER_NAME}/bin/${EXECUTABLE_NAME}
-ENV BROKER_URI="tcp://127.0.0.1:5672"
-ENV LOG_LEVEL="1"
-ENV SLEEP_CYCLE="1500"
+ENV BROKER_URI=tcp://artemiscloud:5672
+ENV LOG_LEVEL=1
+ENV SLEEP_CYCLE=1500
 
 WORKDIR /
 
@@ -68,7 +72,8 @@ COPY containerbuild/bin/entrypoint /home/${USER_NAME}/bin
 
 RUN chown -R `id -u`:0 /home/${USER_NAME}/bin && chmod -R 755 /home/${USER_NAME}/bin
 USER ${USER_UID}:0
-ENTRYPOINT "/home/srt/bin/entrypoint" "--broker-uri" "$BROKER_URI" "-v" "$LOG_LEVEL" "--sleep-cycle" "$SLEEP_CYCLE"
+ENTRYPOINT /home/srt/bin/entrypoint --broker-uri ${BROKER_URI} --sleep-cycle ${SLEEP_CYCLE}
+CMD [-v, ${LOG_LEVEL}]
 
 LABEL \
       com.srt.component="srt-game-server" \

config.yaml

@@ -1,5 +1,5 @@
 ---
-broker-uri: "tcp://10.88.0.5:5672"
+broker-uri: "tcp://artemiscloud:5672"
 sleep-cycle: 1500
 command-in: "COMMAND.IN"
 game-event-out: "GAME.EVENT.OUT"

containerbuild/bin/entrypoint

@@ -11,5 +11,5 @@ if ! whoami &>/dev/null; then
   fi
 fi
 
-echo "exec ${EXECUTABLE}"
-exec ${EXECUTABLE} $@
+echo "exec ${EXECUTABLE} ${@}"
+exec "${EXECUTABLE}" "${@}"

docker-compose.yaml

@@ -0,0 +1,24 @@
+version: '3.3'
+services:
+    artemiscloud:
+        container_name: artemis
+        ports:
+            - '5672:5672'
+        environment:
+            - AMQ_USER=admin
+            - AMQ_PASSWORD=admin
+            - AMQ_ALLOW_ANONYMOUS=true
+        image: 'quay.io/artemiscloud/activemq-artemis-broker:latest'
+        restart: unless-stopped
+    srt-game-server:
+        container_name: srt-game-server
+        build:
+            context: .
+            args:
+                fedora_version: 33
+        environment:
+            - BROKER_URI=tcp://artemiscloud:5672
+        image: 'srt-game-server:latest'
+        links:
+            - artemiscloud
+        restart: unless-stopped

src/Application/Configuration.cpp

@@ -12,11 +12,13 @@
 //   See the License for the specific language governing permissions and
 //   limitations under the License.
 
-#include "Configuration.h"
-#include "../Logging/loguru.hpp"
+#include <cstring>
 #include <yaml-cpp/node/node.h>
 #include <yaml-cpp/node/parse.h>
-#include <cstring>
+
+#include "Configuration.h"
+#include "../Logging/loguru.hpp"
+#include "../Shared/Strings.h"
 
 // Define the static Singleton pointer
 Configuration *Configuration::m_pConInstance = nullptr;
@@ -60,7 +62,9 @@ void Configuration::Init(int &argc, char *argv[]) {
     // Override yaml config and default values with any matching command line args
     for (int i = 1; i < argc; ++i) {
         if (0 == strcmp(argv[i], "--broker-uri")) {
-            m_pConInstance->BrokerUri = argv[++i];
+            std::string m_strBrokerUri(argv[++i]);
+            trim(m_strBrokerUri);
+            m_pConInstance->BrokerUri = m_strBrokerUri;
         } else if (0 == strcmp(argv[i], "--sleep-cycle")) {
             m_pConInstance->SleepCycle = strtol(argv[++i], nullptr, 0);
         } else if (0 == strcmp(argv[i], "--command-in")) {

src/Shared/Strings.h

@@ -0,0 +1,40 @@
+#pragma once
+
+//   Provides useful String functions.
+//
+//   Copyright 2021 Derek Reese
+//
+//   Licensed under the Apache License, Version 2.0 (the "License");
+//   you may not use this file except in compliance with the License.
+//   You may obtain a copy of the License at
+//
+//       http://www.apache.org/licenses/LICENSE-2.0
+//
+//   Unless required by applicable law or agreed to in writing, software
+//   distributed under the License is distributed on an "AS IS" BASIS,
+//   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//   See the License for the specific language governing permissions and
+//   limitations under the License.
+
+#include <algorithm>
+#include <cctype>
+#include <cstring>
+// @TODO: Convert this to string_view for CPP17.
+#include <string>
+
+static inline void ltrim(std::string &str) {
+    str.erase(str.begin(), std::find_if(str.begin(), str.end(), [](unsigned char chr) {
+        return !std::isspace(chr) || reinterpret_cast<const char*>(chr) == "\"";
+    }));
+}
+
+static inline void rtrim(std::string &str) {
+    str.erase(std::find_if(str.rbegin(), str.rend(), [](unsigned char chr) {
+        return !std::isspace(chr) || reinterpret_cast<const char*>(chr) == "\"";
+    }).base(), str.end());
+}
+
+static inline void trim(std::string &str) {
+    ltrim(str);
+    rtrim(str);
+}