attempting to fix migration

notaryproject · May 8, 2017 · 5f66149 · 5f66149
1 parent ef07f20
commit 5f66149
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 13 deletions.
diff --git a/migrations/migrate.sh b/migrations/migrate.sh
@@ -10,7 +10,7 @@ case $SERVICE_NAME in
 		MIGRATIONS_PATH=${MIGRATIONS_PATH:-migrations/server/mysql}
 		DB_URL=${DB_URL:-mysql://server@tcp(mysql:3306)/notaryserver}
 		# have to poll for DB to come up
-		until migrate -path=$MIGRATIONS_PATH -url=$DB_URL version > /dev/null
+		until migrate -path=$MIGRATIONS_PATH -database=$DB_URL version > /dev/null
 		do
 			iter=$(( iter+1 ))
 			if [[ $iter -gt 30 ]]; then
@@ -20,8 +20,8 @@ case $SERVICE_NAME in
 			echo "waiting for $DB_URL to come up."
 			sleep 1
 		done
-		pre=$(migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" version)
-		if migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" up ; then
+		pre=$(migrate -path=$MIGRATIONS_PATH -database="${DB_URL}" version)
+		if migrate -path=$MIGRATIONS_PATH -database="${DB_URL}" up ; then
 			post=$(migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" version)
 			if [ "$pre" != "$post" ]; then
 				echo "notaryserver database migrated to latest version"
@@ -37,7 +37,7 @@ case $SERVICE_NAME in
 		MIGRATIONS_PATH=${MIGRATIONS_PATH:-migrations/signer/mysql}
 		DB_URL=${DB_URL:-mysql://signer@tcp(mysql:3306)/notarysigner}
 		# have to poll for DB to come up
-		until migrate -path=$MIGRATIONS_PATH -url=$DB_URL up version > /dev/null
+		until migrate -path=$MIGRATIONS_PATH -database=$DB_URL up version > /dev/null
 		do
 			iter=$(( iter+1 ))
 			if [[ $iter -gt 30 ]]; then
@@ -47,9 +47,9 @@ case $SERVICE_NAME in
 			echo "waiting for $DB_URL to come up."
 			sleep 1
 		done
-		pre=$(migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" version)
-		if migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" up ; then
-			post=$(migrate -path=$MIGRATIONS_PATH -url="${DB_URL}" version)
+		pre=$(migrate -path=$MIGRATIONS_PATH -database="${DB_URL}" version)
+		if migrate -path=$MIGRATIONS_PATH -database="${DB_URL}" up ; then
+			post=$(migrate -path=$MIGRATIONS_PATH -database="${DB_URL}" version)
 			if [ "$pre" != "$post" ]; then
 				echo "notarysigner database migrated to latest version"
 			else

diff --git a/server.Dockerfile b/server.Dockerfile
@@ -4,9 +4,7 @@ MAINTAINER David Lawrence "david.lawrence@docker.com"
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
 
 # Pin to the specific v3.0.0 version
-RUN git clone -b v3.0.0 https://github.com/mattes/migrate.git /go/src/github.com/mattes/migrate/ && \
-    go get github.com/mattes/migrate && \
-    go build -tags 'mysql' -o /usr/local/bin/migrate github.com/mattes/migrate
+RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
 
 ENV NOTARYPKG github.com/docker/notary
 

diff --git a/signer.Dockerfile b/signer.Dockerfile
@@ -4,9 +4,7 @@ MAINTAINER David Lawrence "david.lawrence@docker.com"
 RUN apk add --update git gcc libc-dev && rm -rf /var/cache/apk/*
 
 # Pin to the specific v3.0.0 version
-RUN git clone -b v3.0.0 https://github.com/mattes/migrate.git /go/src/github.com/mattes/migrate/ && \
-    go get github.com/mattes/migrate && \
-    go build -tags 'mysql' -o /usr/local/bin/migrate github.com/mattes/migrate
+RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
 
 ENV NOTARYPKG github.com/docker/notary