Skip to content

Commit

Permalink
Removed .env files
Browse files Browse the repository at this point in the history
  • Loading branch information
devin-aot committed Dec 15, 2022
1 parent d3dfb42 commit c692167
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 63 deletions.
14 changes: 0 additions & 14 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,8 @@ WORKDIR /app
# Set variables

# Set node to production
ARG NODE_ENV
ENV NODE_ENV production

# mssql or postgres
ARG DB_TYPE
ARG POSTGRESQL_HOST
ARG POSTGRESQL_USER
ARG POSTGRESQL_PASSWORD
ARG POSTGRESQL_DATABASE
ARG MSSQL_HOST
ARG MSSQL_PORT
ARG MSSQL_DB
ARG MSSQL_SA_USER
ARG MSSQL_SA_PASSWORD
ARG MSSQL_ENCRYPT

ENV DB_TYPE ${DB_TYPE}
ENV POSTGRESQL_HOST ${POSTGRESQL_HOST}
ENV POSTGRESQL_USER ${POSTGRESQL_USER}
Expand Down
7 changes: 0 additions & 7 deletions backend/sample.env

This file was deleted.

10 changes: 2 additions & 8 deletions database/mssql/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,15 @@
FROM mcr.microsoft.com/mssql/server:2019-latest

ARG MSSQL_HOST
ARG MSSQL_PORT
ARG MSSQL_DB
ARG MSSQL_SA_USER
ARG MSSQL_SA_PASSWORD
ARG MSSQL_ENCRYPT

ENV MSSQL_HOST ${MSSQL_HOST}
ENV MSSQL_PORT ${MSSQL_PORT}
ENV MSSQL_DB ${MSSQL_DB}
ENV MSSQL_SA_USER ${MSSQL_SA_USER}
ENV MSSQL_SA_PASSWORD ${MSSQL_SA_PASSWORD}
ENV MSSQL_ENCRYPT ${MSSQL_ENCRYPT}
ENV MSSQL_DDL_FILENAME ${MSSQL_DDL_FILENAME}

ENV ACCEPT_EULA Y
ENV MSSQL_DDL_FILENAME "sample_ddl.sql"


# Copy initialization scripts
COPY ./ddl/ .
Expand Down
6 changes: 0 additions & 6 deletions database/sample.env

This file was deleted.

49 changes: 22 additions & 27 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,44 +16,41 @@ services:

sql-server-db:
container_name: sql-server-db
env_file:
- /database/.env
build:
context: ./database/mssql
dockerfile: Dockerfile
args:
MSSQL_HOST: ${MSSQL_HOST:-localhost}
MSSQL_PORT: ${MSSQL_PORT:-1433}
MSSQL_DB: ${MSSQL_DB:-onroutebc}
MSSQL_SA_USER: ${MSSQL_SA_USER:-SA}
MSSQL_SA_PASSWORD: ${MSSQL_SA_PASSWORD:-YourStrong@Passw0rd}
MSSQL_ENCRYPT: ${MSSQL_ENCRYPT:-false}
environment:
MSSQL_HOST: localhost
MSSQL_PORT: 1433
MSSQL_DB: onroutebc
MSSQL_SA_USER: SA
MSSQL_SA_PASSWORD: YourStrong@Passw0rd
MSSQL_ENCRYPT: false
MSSQL_DDL_FILENAME: sample_ddl.sql
hostname: sql-server-db
ports:
- "${MSSQL_PORT:-1433}:${MSSQL_PORT:-1433}"
- "1433:1433"
volumes:
- /sql_data

backend:
container_name: backend
env_file:
- /backend/.env
build:
context: ./backend/
dockerfile: Dockerfile
args:
NODE_ENV: development
DB_TYPE: ${DB_TYPE:-mssql}
POSTGRESQL_HOST: database
POSTGRESQL_USER: default
POSTGRESQL_PASSWORD: default
POSTGRESQL_DATABASE: default
MSSQL_HOST: ${MSSQL_HOST:-localhost}
MSSQL_PORT: ${MSSQL_PORT:-1433}
MSSQL_DB: ${MSSQL_DB:-onroutebc}
MSSQL_SA_USER: ${MSSQL_SA_USER:-SA}
MSSQL_SA_PASSWORD: ${MSSQL_SA_PASSWORD:-YourStrong@Passw0rd}
MSSQL_ENCRYPT: ${MSSQL_ENCRYPT:-false}
environment:
NODE_ENV: development
DB_TYPE: mssql
POSTGRESQL_HOST: postgres-db
POSTGRESQL_USER: default
POSTGRESQL_PASSWORD: default
POSTGRESQL_DATABASE: default
MSSQL_HOST: localhost
MSSQL_PORT: 1433
MSSQL_DB: onroutebc
MSSQL_SA_USER: SA
MSSQL_SA_PASSWORD: YourStrong@Passw0rd
MSSQL_ENCRYPT: false
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:5000"]
interval: 1m30s
Expand All @@ -72,8 +69,6 @@ services:

frontend:
container_name: frontend
env_file:
- /frontend/.env
build:
context: ./frontend/
dockerfile: Dockerfile
Expand Down
1 change: 0 additions & 1 deletion frontend/sample.env

This file was deleted.

0 comments on commit c692167

Please sign in to comment.