added migration files to dockerfile (#75)

Author: maikelmclauflin

.travis.yml

@@ -17,6 +17,7 @@ env:
   global:
   - GO111MODULE=on
   - TEST_TAGS="integration"
+  - DATABASE_MIGRATIONS_URL="file://$(pwd)/migrations"
   - secure: gGqNxojD1sfTk4qnFUTQ2vx5V9ryOLEctChxv6iZa1rxbyRE1cB65IPCFquU8Qo7rN4LcqlwpCvEfJHkRs41mOtrkBuRFUSMA1Z0wp6Gpz3jT7nvygRLfkcWMbfHDa2oKS6c9cTWlmanuGl8KWKxZrWzvl7WwtD0Rqfbr3cH74JmOfq5h05ermhE0YNFNKrnra2WZYQGeS9i/qh2nDvnuVw0nI6pXsGpl7fZ/bMDDUipCqSDtfRyV389UAUA5pab+BCp0/hLrDiUOL/xSB2zIoyenQ8mM01MpM1Hx2vh+PrbCJE880ON1374tPRkyNvPlQMeSYv+eZQBT8zxYsQ+xEmfxVvkqvyGo630X5trV5IVQqn+6xlyIFHwemLIpGqwZMg3DlQ2JujQGy6/xfvfd3tMdnzi6NoTtE1h5CYYJ168tnytAz4d3xJ7nGYl4zGejO4971c97JdUY078PYaKDkbRGA0pCk0MYmA9VnkcsPO9v6vW8kV09VFRgNKBJV0YNycWvdTLBF+i8Xe3/aAGMxfJLsbb+gYPTI4cQiIlIc7AlDpd7LzHUuUMQr8cCvK2IoJNnTsgyqtfZZBIbvJkZlEp6EjbKT0Wawh6oC0u+2+9LXYB4tuLDYkprA6NhN5bna4rh/uB826/BXhX6J5SpC4PzDlf985cazEGpyAwyQQ=
   - secure: OvxpTKJ4i+BefkUj52NgTmDXK5/Mm3zkIVyf13uXTEWrEXOs0aRsbxHCmQpHgTK4pMVXGeZ4WlUz7way0zi7QFNsW35dWfDUZ3DCUx7zkSpv10Voan7er2VaI5jiWQSyF+s3yDYQFNZRLHJT9uEoGdAGwBIlC/OCUizBMOMj7hu1bRh0hk3cKHOu6NhHERAN5mrhDltsUGa+FiqzEAO3Ulm19IWUO51xYTritqJV5a741vpmQE4oZLmMw9uWRP/PFeAs8nRSCbfKXgQ9RPz9Dd51A5szgbG00lrg4mmCFI+BgTn8BxKdnNubto0pR4GB6IsJlzR8Zf8c7/6qTIoqDT613K8d7rlZyRpsHtLx4V+H5FhLDGxDzgxvgjVz4xv/SFcQjoqf9R2Wbc/A6+eUq7z15A1SoIgUveCkwvKmVCGtOFi21kUVXPeXY2uCbXuw6dZHWGDPT0oYdZtlNL8EGiqKYW7UHpjj3eiAx0lE/jQbYAYRcTT2grKmXdEEItdAM3FTBqkmJeipyFAYzDVixHHyGMP5lXZ0XVYxp3bDWeiW97LvvO7NZMUKIVhEJ/7vqdn+ZaIjQ5E5v7Npf9oftSiT2Rlol+is7qCzbna+hbzYM+ra/bggkcun8yvLDwDZzCJFwIP0InUBk3OifM/tROrH5YyFpNtwCWRSbGMYfaI=
   - secure: glxxP+EJpAg/NS9u1WcK2rjBHB4W86160N2HdTGEDoLWrU210PBlreUBMRxxh3DkBAYvuKhlGcIMeEy2H+oF5x0UfNO2eR/CVTOhQzvuVshppUq6k/ppCanxMD0fhfTvBJhoATAIqV5e2edwacoWCF+fX5TiZztJ++wmuVF60fylpAoVIAFVx67dJ157/JT5Wh57mocB6j1PNzfTCohqA1LTQ9IbCwWj5omeq3koQ6r8mveay0XF7bGxhW5A7WEUmvzWDWfK2yM77BY0CGWykVZbdexzacK9uW0f9PJSoHhMYQq5mn8L3c7D2I3in/QWtdXl2E/RRCsyREeKxA+9/ZQtM5bcHjp1xfhXQrHCd+8VDuzKtit11+fjYGsuIb4d9qd9CTety/G3+0S63ubTrU6BpssnyImV3nLjLlNoCto74QZPTct06DFDVjw+InJHK95xj6rZmxjGao6VzKWdgiCHB6DM7FNwb3HCad14e3fX59xjpQ1v3KppGXIzqUF5CtZOb8wkgzdorZtdywUyqg1CPa8/poXnhRcaPEHjL5wzGsu9+yYFtNZ6HDcGTIAB4pkgePsfo52/t937dLQ+d3tQlPQpvdjsHkOThqhfqp0tsfB6n7vWfqRQj4F9WG6KhHjMDEx+C4eEAaslPs33hI6yTFW6M48aMnDfBIbMvHk=
@@ -29,8 +30,8 @@ install:
 before_script:
 - make lint
 script:
-- docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d vault 
+- docker-compose -f docker-compose.yml -f docker-compose.dev.yml up -d vault
 - sleep 3
-- VAULT_TOKEN=$(docker logs grant-vault 2>&1 | grep "Root Token" | tail -1 | cut -d ' ' -f 3 ) docker-compose -f docker-compose.yml -f docker-compose.dev.yml run --rm web make 
+- VAULT_TOKEN=$(docker logs grant-vault 2>&1 | grep "Root Token" | tail -1 | cut -d ' ' -f 3 ) docker-compose -f docker-compose.yml -f docker-compose.dev.yml run --rm web make
 after_script:
 - git diff-index --quiet HEAD --

Dockerfile

@@ -10,5 +10,6 @@ CMD ["go", "run", "bin/grant-server/main.go"]
 FROM alpine:3.6
 RUN apk add --update ca-certificates # Certificates for SSL
 COPY --from=builder /src/grant-server /bin/
+COPY --from=builder /src/migrations/ /migrations/
 EXPOSE 3333
 CMD ["/bin/grant-server"]

docker-compose.yml

@@ -7,16 +7,17 @@ networks:
 services:
   web:
     container_name: grant-web
-    image: grant-web-builder 
+    image: grant-web-builder
     build:
       context: .
-      target: builder 
+      target: builder
     ports:
       - "3333:3333"
     environment:
       - "DATABASE_URL=postgres://grants:password@postgres/grants?sslmode=disable"
       - "LEDGER_SERVER=https://ledger-staging.mercury.basicattentiontoken.org"
       - "REDIS_URL=redis://redis:6379"
+      - "DATABASE_MIGRATIONS_URL=file:///src/migrations"
       - BAT_SETTLEMENT_ADDRESS
       - CHALLENGE_BYPASS_SERVER=http://challenge-bypass:2416
       - CHALLENGE_BYPASS_TOKEN
@@ -62,6 +63,7 @@ services:
     environment:
       - "SENTRY_DSN"
       - "DATABASE_URL=postgres://btokens:password@challenge-bypass-postgres/btokens?sslmode=disable"
+      - "DATABASE_MIGRATIONS_URL=file:///src/migrations"
     depends_on:
       - challenge-bypass-postgres
     networks:

promotion/datastore.go

@@ -56,9 +56,12 @@ func (pg *Postgres) NewMigrate() (*migrate.Migrate, error) {
 		return nil, err
 	}
 
+	dbMigrationsURL := os.Getenv("DATABASE_MIGRATIONS_URL")
 	m, err := migrate.NewWithDatabaseInstance(
-		"file:///src/migrations",
-		"postgres", driver)
+		dbMigrationsURL,
+		"postgres",
+		driver,
+	)
 	if err != nil {
 		return nil, err
 	}
@@ -290,10 +293,10 @@ func (pg *Postgres) ClaimForWallet(promotion *Promotion, wallet *wallet.Info, bl
 // GetAvailablePromotionsForWallet returns the list of available promotions for the wallet
 func (pg *Postgres) GetAvailablePromotionsForWallet(wallet *wallet.Info) ([]Promotion, error) {
 	statement := `
-	select 
-		promotions.*, 
+	select
+		promotions.*,
 		promotions.active and promotions.remaining_grants > 0 and (
-			( promotions.promotion_type = 'ugp' and claims.id is null ) or 
+			( promotions.promotion_type = 'ugp' and claims.id is null ) or
 			( ( promotion_type = 'ads' or promotions.version < 5 ) and claims.id is not null and not claims.redeemed )
 		) as available
 	from promotions left join claims on promotions.id = claims.promotion_id and claims.wallet_id = $1;`