Dockerfile + docker-compose

Author: lganzzzo

Dockerfile

@@ -1,5 +1,7 @@
 FROM lganzzzo/alpine-cmake:latest
 
+RUN apk add postgresql-dev
+
 ADD . /service
 
 WORKDIR /service/build

docker-compose.yaml

@@ -0,0 +1,16 @@
+version: '3'
+
+services:
+  db:
+    image: postgres
+    restart: always
+    environment:
+      POSTGRES_PASSWORD: db-pass
+  example-postgresql:
+    build: .
+    ports:
+      - "8000:8000"
+    links:
+      - "db"
+    environment:
+      CONFIG_PROFILE: local-docker

main/CMakeLists.txt

@@ -47,7 +47,7 @@ add_definitions(
 
 include(FindPkgConfig)
 
-set(ENV{PKG_CONFIG_PATH} "/usr/local/pgsql/lib/pkgconfig") ## change this if needed
+set(ENV{PKG_CONFIG_PATH} "/usr/local/pgsql/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}") ## change this if needed
 
 pkg_check_modules(PKG_PQ REQUIRED libpq)
 

main/resources/config.json

@@ -10,7 +10,7 @@
   "local-docker": {
     "port": 8000,
     "swaggerHost": "localhost:8000",
-    "dbHost": "localhost",
+    "dbHost": "db",
     "dbUser": "postgres",
     "dbPass": "db-pass",
     "dbName": "postgres"

main/src/AppComponent.hpp

@@ -16,7 +16,7 @@
 
 #include "oatpp/core/base/CommandLineArguments.hpp"
 
-#include <fstream>
+#include <cstdlib>
 
 class AppComponent {
 private:
@@ -39,7 +39,11 @@ class AppComponent {
     if (configText) {
 
       auto profiles = objectMapper->readFromString<ConfigDto::Fields<ConfigDto::ObjectWrapper>>(configText);
-      const char* profileArg = m_cmdArgs.getNamedArgumentValue("--profile", "dev");
+
+      const char *profileArg = std::getenv("CONFIG_PROFILE"); // first read from env variable
+      if (profileArg == nullptr) {
+        profileArg = m_cmdArgs.getNamedArgumentValue("--profile", "dev"); // if no env varioable get from command line
+      }
 
       OATPP_LOGD("Server", "Loading configuration profile '%s'", profileArg);
 

main/src/db/Database.cpp

@@ -30,7 +30,7 @@ const char* Database::DDL =
 
 const char* Database::SQL_INSERT_USER =
 "INSERT INTO EXAMPLE_USER "
-"(userId, login, password, email, authType) VALUES "
+"(userId, login, password, email) VALUES "
 "(uuid_generate_v4(), $1::varchar, $2::varchar, $3::varchar) "
 "RETURNING *;";
 
@@ -123,7 +123,7 @@ UserDto::ObjectWrapper Database::createUser(const UserDto::ObjectWrapper& user)
   std::lock_guard<std::mutex> lock(m_mutex);
   tryReconnect();
   UserDto::ObjectWrapper createdUser;
-  const v_int32 paramsNumber = 4;
+  const v_int32 paramsNumber = 3;
   const char* params[paramsNumber] = {user->login->c_str(), user->password->c_str(), user->email->c_str()};
   ResultWrapper result = PQexecParams(m_connection, SQL_INSERT_USER, paramsNumber, nullptr, params, nullptr, nullptr, 0);
   if (checkResultOrThrow(result)) {

main/src/dto/ErrorDto.hpp

@@ -18,7 +18,7 @@ class ErrorDto : public oatpp::data::mapping::type::Object {
 
   DTO_INIT(ErrorDto, Object)
 
-  DTO_FIELD(String, service) = "user-service";
+  DTO_FIELD(String, service) = "example-postgresql: user-service";
   DTO_FIELD(Int32, code);
   DTO_FIELD(String, error);
   DTO_FIELD(String, message);