mirror of
https://github.com/outbackdingo/firezone.git
synced 2026-01-27 10:18:54 +00:00
Remove DATABASE_URL from local dev container and use documented ENV variables instead (#1500)
Closes #1499
This commit is contained in:
@@ -4,28 +4,36 @@ FROM firezone/elixir:1.14.3-otp-25.2.1
|
||||
|
||||
# Install dev dependencies / convenience tools
|
||||
RUN apk add \
|
||||
yarn \
|
||||
build-base \
|
||||
git \
|
||||
python3 \
|
||||
curl \
|
||||
net-tools \
|
||||
iproute2 \
|
||||
nftables \
|
||||
inotify-tools \
|
||||
ca-certificates \
|
||||
sudo \
|
||||
nodejs
|
||||
yarn \
|
||||
build-base \
|
||||
git \
|
||||
python3 \
|
||||
curl \
|
||||
net-tools \
|
||||
iproute2 \
|
||||
nftables \
|
||||
inotify-tools \
|
||||
ca-certificates \
|
||||
sudo \
|
||||
nodejs
|
||||
|
||||
WORKDIR /var/app
|
||||
|
||||
ARG GIT_SHA=DEV
|
||||
ARG MIX_ENV=dev
|
||||
ARG DATABASE_URL
|
||||
ARG DATABASE_HOST
|
||||
ARG DATABASE_PORT
|
||||
ARG DATABASE_NAME
|
||||
ARG DATABASE_USER
|
||||
ARG DATABASE_PASSWORD
|
||||
|
||||
ENV GIT_SHA=$GIT_SHA
|
||||
ENV MIX_ENV=$MIX_ENV
|
||||
ENV DATABASE_URL=$DATABASE_URL
|
||||
ENV DATABASE_HOST=$DATABASE_HOST
|
||||
ENV DATABASE_PORT=$DATABASE_PORT
|
||||
ENV DATABASE_NAME=$DATABASE_NAME
|
||||
ENV DATABASE_USER=$DATABASE_USER
|
||||
ENV DATABASE_PASSWORD=$DATABASE_PASSWORD
|
||||
|
||||
RUN mix local.hex --force && mix local.rebar --force
|
||||
|
||||
|
||||
@@ -1,5 +1,12 @@
|
||||
import Config
|
||||
|
||||
config :fz_http, FzHttp.Repo,
|
||||
database: System.get_env("DATABASE_NAME", "firezone_dev"),
|
||||
username: System.get_env("DATABASE_USER", "postgres"),
|
||||
hostname: System.get_env("DATABASE_HOST", "localhost"),
|
||||
port: String.to_integer(System.get_env("DATABASE_PORT", "5432")),
|
||||
password: System.get_env("DATABASE_PASSWORD", "postgres")
|
||||
|
||||
config :fz_http, FzHttpWeb.Endpoint,
|
||||
http: [port: 13000],
|
||||
debug_errors: true,
|
||||
|
||||
@@ -19,7 +19,11 @@ services:
|
||||
context: .
|
||||
dockerfile: Dockerfile.dev
|
||||
args:
|
||||
DATABASE_URL: postgresql://postgres:postgres@postgres:5432/firezone_dev
|
||||
DATABASE_HOST: postgres
|
||||
DATABASE_PORT: 5432
|
||||
DATABASE_NAME: firezone_dev
|
||||
DATABASE_USER: postgres
|
||||
DATABASE_PASSWORD: postgres
|
||||
image: firezone_dev
|
||||
volumes:
|
||||
- ./priv:/var/app/priv
|
||||
|
||||
Reference in New Issue
Block a user