Skip to content

Commit

Permalink
[v0.3.0] Eliminating Need for Downloading Utility Tools (#20)
Browse files Browse the repository at this point in the history
* [v0.3.0] Eliminating Need for Downloading Utility Tools

Signed-off-by: hfuss <haydenfuss@gmail.com>

* fixing registration job

Signed-off-by: hfuss <haydenfuss@gmail.com>
  • Loading branch information
onelapahead authored Feb 16, 2022
1 parent 21bcdda commit a197aba
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 14 deletions.
4 changes: 2 additions & 2 deletions charts/firefly/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ apiVersion: v2
name: firefly
description: A Helm chart for deploying FireFly and FireFly HTTPS Dataexchange onto Kubernetes.
type: application
appVersion: "0.12.0"
version: "0.2.1"
appVersion: "0.13.0"
version: "0.3.0"

maintainers:
- name: hfuss
Expand Down
9 changes: 1 addition & 8 deletions charts/firefly/scripts/ff-db-migrations.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# Install deps
apk add postgresql-client curl jq

# Extract the database name from the end of the PSQL URL, and check it's there
DB_PARAMS=`echo ${PSQL_URL} | sed 's!^.*/!!'`
DB_NAME=`echo ${DB_PARAMS} | sed 's!?.*!!'`
Expand Down Expand Up @@ -52,9 +49,5 @@ until psql -c "SELECT 1;" ${PSQL_URL}; do
sleep 1
done

# Download the latest migration tool
MIGRATE_RELEASE=$(curl -sL https://api.github.com/repos/golang-migrate/migrate/releases/latest | jq -r '.name')
curl -sL https://github.com/golang-migrate/migrate/releases/download/${MIGRATE_RELEASE}/migrate.linux-amd64.tar.gz | tar xz

# Do the migrations
./migrate -database ${PSQL_URL} -path db/migrations/postgres up
migrate -database ${PSQL_URL} -path db/migrations/postgres up
2 changes: 0 additions & 2 deletions charts/firefly/scripts/ff-register-contracts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@

set -e

apk add curl jq

until STATUS=$(curl --fail -s ${ETHCONNECT_URL}/contracts); do
echo "Waiting for Ethconnect..."
sleep 5
Expand Down
2 changes: 0 additions & 2 deletions charts/firefly/scripts/ff-registration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

apk add curl jq

until STATUS=$(curl ${FF_URL}/api/v1/status); do
echo "Waiting for FireFly..."
sleep 5
Expand Down

0 comments on commit a197aba

Please sign in to comment.