diff --git a/docker-compose.yml b/docker-compose.yml index af769b3ca..bc14c6f02 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -30,7 +30,7 @@ services: - 9090:9090 db: - image: gcr.io/trillian-opensource-ci/db_server + image: gcr.io/trillian-opensource-ci/db_server:latest restart: always ports: - "3306" diff --git a/scripts/integration.sh b/scripts/integration.sh index f382566a6..b92b74c7c 100755 --- a/scripts/integration.sh +++ b/scripts/integration.sh @@ -10,13 +10,13 @@ docker-compose -f docker-compose.yml -f docker-compose.prod.yml up -d trap "docker-compose down" INT EXIT set +e -wget -t 60 --spider --retry-connrefused --waitretry=1 0.0.0.0:443 || sleep 2 -wget -t 60 --spider --retry-on-http-error=404 1 0.0.0.0:443/v1/directories/default +wget -T 60 --spider --retry-connrefused localhost:443 +wget -T 60 --spider --retry-on-http-error=404 --no-check-certificate https://localhost/v1/directories/default set -e PASSWORD="foobar" -go run ./cmd/keytransparency-client/main.go authorized-keys create-keyset --password=${PASSWORD} -go run ./cmd/keytransparency-client/main.go post foo@bar.com \ +go run ./cmd/keytransparency-client authorized-keys create-keyset --password=${PASSWORD} +go run ./cmd/keytransparency-client post foo@bar.com \ --insecure \ --data='dGVzdA==' \ --password=${PASSWORD} \