Add reddis to bldg server

bldg_server/Dockerfile

@@ -1,8 +1,8 @@
 # ---- Build Stage ----
-FROM elixir:1.11-alpine AS app_builder
+FROM elixir:1.15-alpine AS app_builder
 
 # Set environment variables for building the application
-ENV MIX_ENV=prod \
+ENV MIX_ENV=dev \
     TEST=1 \
     LANG=C.UTF-8
 
@@ -36,15 +36,15 @@ FROM alpine AS app
 ENV LANG=C.UTF-8
 
 # Install openssl
-RUN apk add --update openssl ncurses-libs postgresql-client && \
+RUN apk add --update bash openssl libgcc ncurses-libs postgresql-client libstdc++ && \
     rm -rf /var/cache/apk/*
 
 
 # Copy over the build artifact from the previous step and create a non root user
 RUN adduser -D -h /home/app app
 WORKDIR /home/app
 COPY --from=app_builder /app/_build .
-RUN chown -R app: ./prod
+RUN chown -R app: ./dev
 USER app
 
 

bldg_server/Dockerfile.local-dev

@@ -0,0 +1,23 @@
+# Elixir + Phoenix
+ARG EX_VERSION=1.15
+
+FROM elixir:$EX_VERSION
+
+# Install debian packages
+RUN apt-get update
+RUN apt-get install --yes build-essential inotify-tools postgresql-client
+
+# Install Phoenix packages
+ARG PHX_VERSION=1.5.6
+RUN mix local.hex --force
+RUN mix local.rebar --force
+RUN mix archive.install hex phx_new $PHX_VERSION
+
+# Install node
+# RUN curl -sL https://deb.nodesource.com/setup_6.x -o nodesource_setup.sh
+# RUN bash nodesource_setup.sh
+# RUN apt-get install --yes nodejs npm
+
+WORKDIR /app
+EXPOSE 4000
+EXPOSE 4443

bldg_server/config/dev.exs

@@ -2,10 +2,10 @@ use Mix.Config
 
 # Configure your database
 config :bldg_server, BldgServer.Repo,
-  username: "udi",
-  password: "",
+  username: System.get_env("DB_USER", "postgres"),
+  password: System.get_env("DB_PASSWORD", ""),
   database: "bldg_server_dev",
-  hostname: "localhost",
+  hostname: System.get_env("DB_HOST", "db"),
   show_sensitive_data_on_connection_error: true,
   pool_size: 10
 
@@ -19,6 +19,7 @@ config :bldg_server, BldgServerWeb.Endpoint,
   http: [port: 4000],
   https: [port: 4443,
           otp_app: :bldg_server,
+          cipher_suite: :strong,
           keyfile: "priv/cert/localhost.key",
           certfile: "priv/cert/localhost.cert"],
   debug_errors: true,

bldg_server/config/test.exs

@@ -3,9 +3,9 @@ use Mix.Config
 # Configure your database
 config :bldg_server, BldgServer.Repo,
   username: "postgres",
-  password: "postgres",
+  password: System.get_env("DB_PASSWORD", "postgres"),
   database: "bldg_server_test",
-  hostname: "localhost",
+  hostname: System.get_env("DB_HOST", "localhost"),
   pool: Ecto.Adapters.SQL.Sandbox
 
 # We don't run a server during test. If one is required,

bldg_server/docker-compose.yml

@@ -1,32 +1,45 @@
-version: '3.1'
+version: "3.2"
 
 services:
-
-  database:
+  db:
     image: postgres
     restart: always
     environment:
-      POSTGRES_USER: ${DB_USER}
-      POSTGRES_PASSWORD: ${DB_PASSWORD}
-      POSTGRES_DB: bldg_server_prod
-      PGDATA: /var/lib/postgresql/data/pgdata
-    volumes: 
-      - db_data:/var/lib/postgresql/data
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: 
+      POSTGRES_HOST_AUTH_METHOD: trust
+    ports:
+      - "5432:5432"
+    volumes:
+      - ./devops/db/initial_db_data.sql:/docker-entrypoint-initdb.d/initial_db_data.sql
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U postgres"]
+      interval: 5s
+      timeout: 5s
+      retries: 5
 
   web:
-    image: bldg-server
-    restart: always
+    image: dibaunaumh/bldg-server:v063
+    volumes:
+      - type: bind
+        source: .
+        target: /app
     ports:
-      - ${APP_PORT}:${APP_PORT}
-    environment:
-      APP_HOSTNAME: ${APP_HOSTNAME}
-      APP_PORT: ${APP_PORT}
-      DB_USER: ${DB_USER}
-      DB_PASSWORD: ${DB_PASSWORD}
-      DB_HOST: ${DB_HOST}
-      SECRET_KEY_BASE: ${SECRET_KEY_BASE}
+      - "4000:4000"
+      - "4443:4443"
+    env_file: docker.env
     depends_on:
-      - database
+      db:
+          condition: service_healthy
+    # command:
+    #   - ./run.sh
+  redis:
+      image: redis
+      container_name: redis-server
+      ports:
+        - "6379:6379"
+      volumes:
+        - redis-data:/data
 
 volumes:
-  db_data:
+      redis-data:

bldg_server/docker.env

@@ -0,0 +1,10 @@
+APP_HOSTNAME=localhost
+APP_PORT=4443
+DB_USER=postgres
+DB_PASSWORD=
+DB_HOST=db
+DB_PORT=5432
+DB_NAME=bldg_server_dev
+DB_SSL=false
+SECRET_KEY_BASE=notsecret
+SENDGRID_API_KEY=notapikey

bldg_server/entrypoint.sh

@@ -10,6 +10,6 @@ do
 done
 
 
-./prod/rel/bldg_server/bin/bldg_server eval BldgServer.Release.migrate
+./dev/rel/bldg_server/bin/bldg_server eval BldgServer.Release.migrate
 
-./prod/rel/bldg_server/bin/bldg_server start
+./dev/rel/bldg_server/bin/bldg_server start