From 88594d559782fbcc3006e800cac2f1857ec38f8d Mon Sep 17 00:00:00 2001 From: Callum Oakley Date: Mon, 6 Jun 2022 11:25:55 +0100 Subject: [PATCH] bump stardog docker to get new license --- .circleci/config.yml | 11 ++++++++--- drafter/docker-compose.yml | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index f3fb3238d..f2801ac48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -13,12 +13,13 @@ executors: auth: username: $DOCKERHUB_USERNAME # can specify string literal values password: $DOCKERHUB_PASSWORD # or project environment variable reference - - image: swirrl/stardog:6.2.3 + - image: "europe-west2-docker.pkg.dev/swirrl-devops-infrastructure-1/swirrl/\ + stardog:6.2.3--2022-06-06" environment: CREATE_DATABASE: drafter-test-db auth: - username: $DOCKERHUB_USERNAME # can specify string literal values - password: $DOCKERHUB_PASSWORD # or project environment variable reference + username: _json_key + password: ${GCLOUD_SERVICE_KEY} resource_class: medium @@ -214,6 +215,7 @@ workflows: - drafter-auth0-dev-creds # creds for our auth0 dev setup - swirrl-dockerhub-consumer - stardog-jfrog-repository + - gcp-artifact-registry - test-drafter-basic-auth: filters: tags: @@ -223,6 +225,7 @@ workflows: - drafter-auth0-dev-creds # creds for our auth0 dev setup - swirrl-dockerhub-consumer - stardog-jfrog-repository + - gcp-artifact-registry - test-drafter-non-api: filters: tags: @@ -232,6 +235,7 @@ workflows: - drafter-auth0-dev-creds # creds for our auth0 dev setup - swirrl-dockerhub-consumer - stardog-jfrog-repository + - gcp-artifact-registry - test-drafterclient: filters: tags: @@ -241,6 +245,7 @@ workflows: - drafter-auth0-dev-creds # creds for our auth0 dev setup - swirrl-dockerhub-consumer - stardog-jfrog-repository + - gcp-artifact-registry - build-artifacts: filters: tags: diff --git a/drafter/docker-compose.yml b/drafter/docker-compose.yml index 8fa406189..b478fb47d 100644 --- a/drafter/docker-compose.yml +++ b/drafter/docker-compose.yml @@ -1,7 +1,8 @@ version: "3.9" services: stardog: - image: "swirrl/stardog:6.2.3" + image: "europe-west2-docker.pkg.dev/swirrl-devops-infrastructure-1/swirrl/\ + stardog:6.2.3--2022-06-06" ports: - "5820:5820" environment: