You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by fr...@apache.org on 2017/05/31 14:10:01 UTC
[23/24] incubator-trafficcontrol git commit: move goose install
move goose install
(cherry picked from commit 5cca48df2546cd8378a150122c4b054a0e03f398)
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/7d14110d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/7d14110d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/7d14110d
Branch: refs/heads/2.0.x
Commit: 7d14110d4b7e1062b8574b5f0827bce215de8be3
Parents: 1e3f10a
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed May 24 15:00:07 2017 +0000
Committer: Eric Friedrich <fr...@apache.org>
Committed: Wed May 31 10:08:57 2017 -0400
----------------------------------------------------------------------
traffic_ops/install/bin/_postinstall | 6 ------
traffic_ops/install/bin/postinstall | 5 ++---
2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7d14110d/traffic_ops/install/bin/_postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/_postinstall b/traffic_ops/install/bin/_postinstall
index 7f64806..b5f12da 100755
--- a/traffic_ops/install/bin/_postinstall
+++ b/traffic_ops/install/bin/_postinstall
@@ -848,12 +848,6 @@ sub main {
errorOut("Failed to install Traffic Ops Web dependencies, check the console output and rerun postinstall once you've resolved the error");
}
- InstallUtils::logger( "Installing Go and Goose.." );
- my $rc = InstallUtils::execCommand( "./install_goose.sh" );
- if ( $rc != 0 ) {
- errorOut("Failed to install Go/Goose check the console output and rerun postinstall once you've resolved the error");
- }
-
# The generator functions handle checking input/default/automatic mode
# todbconf will be used later when setting up the database
my $todbconf = generateDbConf( $userInput, $databaseConfFile, $dbConfFile );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/7d14110d/traffic_ops/install/bin/postinstall
----------------------------------------------------------------------
diff --git a/traffic_ops/install/bin/postinstall b/traffic_ops/install/bin/postinstall
index 7c0e04e..95b1142 100755
--- a/traffic_ops/install/bin/postinstall
+++ b/traffic_ops/install/bin/postinstall
@@ -47,9 +47,8 @@ cd /opt/traffic_ops/app
export POSTGRES_HOME=${POSTGRES_HOME:-/usr/pgsql-9.6}
/usr/local/bin/carton
-mkdir -p /opt/traffic_ops/go
-export GOPATH=${GOPATH:-/opt/traffic_ops/go}
-go get bitbucket.org/liamstask/goose/cmd/goose
+# Install go and goose
+/opt/traffic_ops/install/bin/install_goose.sh
export PERL5LIB=/opt/traffic_ops/app/lib:/opt/traffic_ops/app/local/lib/perl5
/opt/traffic_ops/install/bin/_postinstall "$@"