This is an automated email from the ASF dual-hosted git repository.
ocket8888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficcontrol.git
The following commit(s) were added to refs/heads/master by this push:
new 8ede898 Switch goose provider to github.com/kevinburke/goose (#5699)
8ede898 is described below
commit 8ede898330539e2e72343f04e6a3de142b325385
Author: Zach Hoffman <[email protected]>
AuthorDate: Wed Apr 14 16:17:37 2021 -0600
Switch goose provider to github.com/kevinburke/goose (#5699)
* Switch goose provider to github.com/kevinburke/goose
* Update repo in more places
* Disable Go modules to run `go get` to avoid modifying go.mod
---
.github/actions/todb-init/Dockerfile | 2 +-
.github/actions/todb-init/entrypoint.sh | 2 +-
CHANGELOG.md | 1 +
docs/source/development/traffic_ops.rst | 4 ++--
traffic_ops/install/bin/install_goose.sh | 3 +--
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/actions/todb-init/Dockerfile
b/.github/actions/todb-init/Dockerfile
index 6146921..c8ad2e2 100644
--- a/.github/actions/todb-init/Dockerfile
+++ b/.github/actions/todb-init/Dockerfile
@@ -23,7 +23,7 @@ RUN architecture=$(uname -m) && \
# Use musl libc where the go binary expects glibc
# Less-generalized: ln -s /lib/ld-musl-x86_64.so.1
/lib64/ld-linux-x86-64.so.2
ln -s /lib/ld-musl-${architecture}.so.[0-9]
/lib64/ld-linux-${architecture//_/-}.so.2
-# Do not disable CGO, bitbucket.org/liamstask/goose needs it
+# Do not disable CGO, github.com/kevinburke/goose needs it
ENV GOROOT=/usr/local/go
RUN apk add --no-cache git
diff --git a/.github/actions/todb-init/entrypoint.sh
b/.github/actions/todb-init/entrypoint.sh
index 53e15e1..55a43f9 100755
--- a/.github/actions/todb-init/entrypoint.sh
+++ b/.github/actions/todb-init/entrypoint.sh
@@ -31,7 +31,7 @@ GOPATH="$(mktemp -d)"
export PATH="${GOPATH}/bin:${PATH}" GOPATH
apk add --no-cache git gcc gettext postgresql-client musl-dev
-go get -v bitbucket.org/liamstask/goose/cmd/goose
+GO111MODULE=off go get -v github.com/kevinburke/goose/cmd/goose
mv $GOPATH/bin/goose /bin/ &&\
apk del git gcc musl-dev
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20e79ae..17d0d95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -63,6 +63,7 @@ The format is based on [Keep a
Changelog](http://keepachangelog.com/en/1.0.0/).
- Refactored the Traffic Ops - Traffic Vault integration to more easily
support the development of new Traffic Vault backends
- Updated Apache Tomcat from 8.5.63 to 9.0.43
- Delivery Service Requests now keep a record of the changes they make.
+- Changed the `goose` provider to the maintained fork
[`github.com/kevinburke/goose`](https://github.com/kevinburke/goose)
### Deprecated
- The `riak.conf` config file and its corresponding `--riakcfg` option in
`traffic_ops_golang` have been deprecated. Please use `"traffic_vault_backend":
"riak"` and `"traffic_vault_config"` (with the existing contents of riak.conf)
instead.
diff --git a/docs/source/development/traffic_ops.rst
b/docs/source/development/traffic_ops.rst
index 9adb978..93cc710 100644
--- a/docs/source/development/traffic_ops.rst
+++ b/docs/source/development/traffic_ops.rst
@@ -28,7 +28,7 @@ Software Requirements
=====================
Traffic Ops is only supported on CentOS 7+ systems (although many developers
do use Mac OS with some success). Here are the requirements:
-- `Goose <https://bitbucket.org/liamstask/goose/>`_ (although the
``postinstall`` script will install this)
+- `Goose <https://github.com/kevinburke/goose>`_ (although the ``postinstall``
script will install this)
- `PostgreSQL 13.2 <https://www.postgresql.org/download/>`_ - the machine
where Traffic Ops is running must have the client tool set (e.g.
:manpage:`psql(1)`), but the actual database can be run anywhere so long as it
is accessible.
.. note:: Prior to version 13.2, Traffic Ops used version 9.6. For
upgrading an existing Mac OS Homebrew-based PostgreSQL instance, you can use
`Homebrew <https://brew.sh/>`_ to easily upgrade from 9.6 to 13.2:
@@ -180,7 +180,7 @@ Traffic Ops Project Tree Overview
app/db/admin
============
-The :program:`app/db/admin` binary is for use in managing the Traffic Ops
database tables. This essentially serves as a front-end for `Goose
<https://bitbucket.org/liamstask/goose/>`_.
+The :program:`app/db/admin` binary is for use in managing the Traffic Ops
database tables. This essentially serves as a front-end for `Goose
<https://github.com/kevinburke/goose>`_.
.. note:: For proper resolution of configuration and SOL statement files, it's
recommended that this binary be run from the ``app`` directory
diff --git a/traffic_ops/install/bin/install_goose.sh
b/traffic_ops/install/bin/install_goose.sh
index 94ee3ca..7f387c6 100755
--- a/traffic_ops/install/bin/install_goose.sh
+++ b/traffic_ops/install/bin/install_goose.sh
@@ -20,7 +20,6 @@ echo "Now installing goose"
export GOPATH=/opt/traffic_ops/go
mkdir -p $GOPATH
-go get -v bitbucket.org/liamstask/goose/cmd/goose
-go get -v github.com/lib/pq
+GO111MODULE=off go get -v github.com/kevinburke/goose/cmd/goose
echo "Successfully installed goose to $GOPATH/bin/goose"
