You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/01/10 03:38:56 UTC
[44/50] incubator-trafficcontrol git commit: conversion -- move env
settings to separate files
conversion -- move env settings to separate files
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dc136a18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dc136a18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dc136a18
Branch: refs/heads/master
Commit: dc136a189c1f1ca1709d5d91bc16eeda34d38f7c
Parents: eafd482
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Dec 21 11:25:07 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Sun Jan 8 21:05:12 2017 -0700
----------------------------------------------------------------------
traffic_ops/app/db/pg-migration/dataimport.env | 19 +++++++++++++++++++
traffic_ops/app/db/pg-migration/dataimport.yml | 6 ++----
.../app/db/pg-migration/docker-compose.yml | 4 ----
.../app/db/pg-migration/postgres_host.yml | 6 ++----
4 files changed, 23 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc136a18/traffic_ops/app/db/pg-migration/dataimport.env
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/dataimport.env b/traffic_ops/app/db/pg-migration/dataimport.env
new file mode 100644
index 0000000..b177869
--- /dev/null
+++ b/traffic_ops/app/db/pg-migration/dataimport.env
@@ -0,0 +1,19 @@
+#!/bin/bash -x
+#
+# 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.
+#
+
+TO_SERVER=http://traffic_ops.example.com
+TO_USER=to_user
+TO_PASSWORD=twelve
+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc136a18/traffic_ops/app/db/pg-migration/dataimport.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/dataimport.yml b/traffic_ops/app/db/pg-migration/dataimport.yml
index 1087efa..b949925 100644
--- a/traffic_ops/app/db/pg-migration/dataimport.yml
+++ b/traffic_ops/app/db/pg-migration/dataimport.yml
@@ -20,7 +20,5 @@ services:
context: .
dockerfile: Dockerfile-traffic_ops-client
restart: "no"
- environment:
- - TO_USER
- - TO_PASSWORD
- - TO_SERVER
+ env_file:
+ - dataimport.env
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc136a18/traffic_ops/app/db/pg-migration/docker-compose.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/docker-compose.yml b/traffic_ops/app/db/pg-migration/docker-compose.yml
index a9d9d85..7dc4f5b 100644
--- a/traffic_ops/app/db/pg-migration/docker-compose.yml
+++ b/traffic_ops/app/db/pg-migration/docker-compose.yml
@@ -43,10 +43,6 @@ services:
extends:
service: postgres_host
file: postgres_host.yml
- environment:
- - POSTGRES_DB=traffic_ops
- - POSTGRES_PASSWORD=twelve
- - POSTGRES_USER=traffic_ops
depends_on:
- mysql
volumes:
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dc136a18/traffic_ops/app/db/pg-migration/postgres_host.yml
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/pg-migration/postgres_host.yml b/traffic_ops/app/db/pg-migration/postgres_host.yml
index f8e0439..9e1100f 100644
--- a/traffic_ops/app/db/pg-migration/postgres_host.yml
+++ b/traffic_ops/app/db/pg-migration/postgres_host.yml
@@ -18,9 +18,7 @@ services:
build:
context: ..
dockerfile: pg-migration/Dockerfile-postgres
- environment:
- - POSTGRES_DB=traffic_ops
- - POSTGRES_PASSWORD=twelve
- - POSTGRES_USER=traffic_ops
+ env_file:
+ - postgres.env
ports:
- 5432