Skip to content

Commit

Permalink
chore: remove unused orb/sidetree docker container (#1426)
Browse files Browse the repository at this point in the history
Signed-off-by: Rolson Quadras <[email protected]>
  • Loading branch information
rolsonquadras authored Sep 14, 2023
1 parent f33dce4 commit 1639433
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 90 deletions.
1 change: 0 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ jobs:
go-version: '${{ env.GO_VERSION }}'
- name: Run BDD tests
run: |
echo '127.0.0.1 testnet.orb.local' | sudo tee -a /etc/hosts
echo '127.0.0.1 file-server.trustbloc.local' | sudo tee -a /etc/hosts
echo '127.0.0.1 did-resolver.trustbloc.local' | sudo tee -a /etc/hosts
echo '127.0.0.1 oidc-provider.example.com' | sudo tee -a /etc/hosts
Expand Down
1 change: 0 additions & 1 deletion docs/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ make bdd-test

To run BDD tests (`make bdd-test`) you need to modify your hosts file (`/etc/hosts` on \*NIX) to add the following lines, to allow a few of the bdd test containers to be connected to externally.

127.0.0.1 testnet.orb.local
127.0.0.1 vault.kms.example.com
127.0.0.1 metrics.example.com
127.0.0.1 vc-rest-echo.trustbloc.local
Expand Down
5 changes: 0 additions & 5 deletions scripts/check_integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,6 @@ TAGS=${TAGS:-all}
PWD=`pwd`
cd test/bdd

echo "---
Important: for these test to run correctly, you must ensure that your hosts file has the following entries:
127.0.0.1 testnet.orb.local
---
"
echo "Running vcs integration tests with tag=$TAGS"


Expand Down
3 changes: 0 additions & 3 deletions test/bdd/fixtures/.env
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,6 @@ MONGODB_IMAGE=mongo
MONGODB_IMAGE_TAG=4.0.0
MONGODB_PORT=27017

# sidetree
SIDETREE_MOCK_IMAGE=ghcr.io/trustbloc-cicd/sidetree-mock
SIDETREE_MOCK_IMAGE_TAG=0.7.0-snapshot-1a17931

# API gateway and OAuth provider
KRAKEND_IMAGE_TAG=2.1.3
Expand Down
32 changes: 0 additions & 32 deletions test/bdd/fixtures/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ services:
- VC_REST_API_GATEWAY_URL=https://api-gateway.trustbloc.local:5566
- VC_REST_HOST_URL_EXTERNAL=http://vc-rest-echo.trustbloc.local:8075
- VC_REST_PROFILES_FILE_PATH=/profile/profiles.json
- VC_REST_ORB_DOMAIN=testnet.orb.local
- DATABASE_TYPE=mongodb
- DATABASE_URL=mongodb://mongodb.example.com:27017
- DATABASE_PREFIX=vc_rest_echo_
Expand Down Expand Up @@ -52,7 +51,6 @@ services:
- "48127:48127"
depends_on:
- did-resolver.trustbloc.local
- sidetree
entrypoint: ""
command: /bin/sh -c "sleep 5;vc-rest start"
volumes:
Expand Down Expand Up @@ -125,36 +123,6 @@ services:
networks:
- bdd_net

sidetree:
container_name: testnet.orb.local
image: ghcr.io/trustbloc-cicd/orb:v1.0.0-rc4-snapshot-780ce20
restart: always
environment:
- ORB_HOST_URL=0.0.0.0:443
- ORB_EXTERNAL_ENDPOINT=https://testnet.orb.local
- DID_NAMESPACE=did:orb
- ALLOWED_ORIGINS=https://testnet.orb.local
- CAS_TYPE=local
- ANCHOR_CREDENTIAL_SIGNATURE_SUITE=Ed25519Signature2018
- DATABASE_TYPE=mem
- ORB_KMS_TYPE=local
- KMSSECRETS_DATABASE_TYPE=mem
- INCLUDE_PUBLISHED_OPERATIONS_IN_METADATA=true
- INCLUDE_UNPUBLISHED_OPERATIONS_IN_METADATA=true
- UNPUBLISHED_OPERATION_STORE_ENABLED=true
- BATCH_WRITER_TIMEOUT=1
- ORB_TLS_CERTIFICATE=/etc/keys/tls/ec-pubCert.pem
- ORB_TLS_KEY=/etc/keys/tls/ec-key.pem
- ORB_TLS_CACERTS=/etc/keys/tls/ec-cacert.pem
- ORB_TLS_SYSTEMCERTPOOL=true
ports:
- 443:443
command: start
volumes:
- ./keys/tls:/etc/keys/tls
networks:
- bdd_net

file-server.trustbloc.local: # file server for hosting static resources (e.g. JSON-LD contexts)
container_name: file-server.trustbloc.local
image: halverneus/static-file-server:latest
Expand Down
64 changes: 16 additions & 48 deletions test/bdd/fixtures/profile/profiles.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -188,9 +186,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -216,9 +212,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -240,9 +234,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -268,9 +260,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -446,9 +436,7 @@
]
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -474,9 +462,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -498,9 +484,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -522,9 +506,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -546,9 +528,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -570,9 +550,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand All @@ -594,9 +572,7 @@
}
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -977,9 +953,7 @@
]
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -1160,9 +1134,7 @@
]
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -1279,9 +1251,7 @@
]
}
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"issuer": {
Expand Down Expand Up @@ -1634,9 +1604,7 @@
}
]
},
"createDID": true,
"didDomain": "https://testnet.orb.local",
"didServiceAuthToken": "tk1"
"createDID": true
},
{
"verifier": {
Expand Down

0 comments on commit 1639433

Please sign in to comment.