chore: removed oathkeeper from wallet server composer

Signed-off-by: Anton Biriukov <anton.biriukov@securekey.com>

test/fixtures/wallet-web/docker-compose-server.yml

@@ -3,10 +3,9 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 #
-version: '2'
+version: "2"
 
 services:
-
   wallet-server.trustbloc.local:
     container_name: wallet-server.trustbloc.local
     image: ${WALLET_SERVER_IMAGE}:latest
@@ -125,7 +124,6 @@ services:
       - edv.trustbloc.local
       - mongodb.example.com
 
-
   mongodb.example.com:
     container_name: mongodb.example.com
     image: mongo:4.0.0
@@ -147,6 +145,7 @@ services:
       - EDV_LOCALKMS_SECRETS_DATABASE_URL=${EDV_DATABASE_URL}
       - EDV_LOCALKMS_SECRETS_DATABASE_PREFIX=${EDV_DATABASE_PREFIX}_kms_
       - EDV_EXTENSIONS=ReturnFullDocumentsOnQuery,Batch
+      - EDV_CORS_ENABLE=true
     ports:
       - ${EDV_PORT}:${EDV_PORT}
     volumes:
@@ -186,7 +185,7 @@ services:
     ports:
       - 8044:8044
     entrypoint: ""
-    command:  /bin/sh -c "sleep 30 && auth-rest start"
+    command: /bin/sh -c "sleep 30 && auth-rest start"
     volumes:
       - ../keys:/etc/keys
       - ./oidc-config:/etc/oidc-config
@@ -201,7 +200,7 @@ services:
     ports:
       - 5555:5555 # Public port
       - 5556:5556 # Admin port
-    command:  /bin/sh -c "hydra migrate sql --read-from-env --yes; tmp/hydra_configure.sh& hydra serve all"
+    command: /bin/sh -c "hydra migrate sql --read-from-env --yes; tmp/hydra_configure.sh& hydra serve all"
     entrypoint: ""
     environment:
       - DSN=mysql://authresthydra:authresthydra-secret-pw@tcp(mysql:3306)/authresthydra?max_conns=20&max_idle_conns=4
@@ -228,7 +227,7 @@ services:
     ports:
       - 7777:7777 # Public port
       - 7778:7778 # Admin port
-    command:  /bin/sh -c "hydra migrate sql --read-from-env --yes; tmp/hydra_configure.sh& hydra serve all"
+    command: /bin/sh -c "hydra migrate sql --read-from-env --yes; tmp/hydra_configure.sh& hydra serve all"
     entrypoint: ""
     environment:
       - DSN=mysql://demohydra:demohydra-pwd@tcp(mysql:3306)/demohydra?max_conns=20&max_idle_conns=4
@@ -307,7 +306,6 @@ services:
     image: ${KMS_IMAGE}:${KMS_IMAGE_TAG}
     environment:
       - KMS_HOST=${KMS_HOST}:${DEMO_OPS_KMS_PORT}
-      - KMS_BASE_URL=https://oathkeeper-ops-keyserver.trustbloc.local:4462
       - KMS_TLS_CACERTS=/etc/tls/ec-cacert.pem
       - KMS_TLS_SERVE_CERT=/etc/tls/ec-pubCert.pem
       - KMS_TLS_SERVE_KEY=/etc/tls/ec-key.pem
@@ -320,6 +318,7 @@ services:
       - KMS_LOG_LEVEL=debug
       - KMS_GNAP_SIGNING_KEY=/etc/gnap-priv-key.pem
       - KMS_AUTH_SERVER_URL=https://auth.trustbloc.local:8044
+      - KMS_CORS_ENABLE=true
     ports:
       - ${DEMO_OPS_KMS_PORT}:${DEMO_OPS_KMS_PORT}
     command: start
@@ -335,7 +334,7 @@ services:
     # will add self-signed certificate to the “trusted list” because oathkeeper doesn't trust self-signed certificate
     # https://github.com/ory/oathkeeper/issues/181
     # remove it when using real certificate
-    command:  /bin/sh -c "cp /etc/tls/ec-cacert.pem /usr/local/share/ca-certificates/;update-ca-certificates;oathkeeper serve proxy --config /oathkeeper/config.yaml"
+    command: /bin/sh -c "cp /etc/tls/ec-cacert.pem /usr/local/share/ca-certificates/;update-ca-certificates;oathkeeper serve proxy --config /oathkeeper/config.yaml"
     user: root
     entrypoint: ""
     environment:
@@ -352,40 +351,3 @@ services:
     volumes:
       - ../edv-oathkeeper:/oathkeeper
       - ../keys/tls:/etc/tls
-
-
-  oathkeeper-auth-keyserver.trustbloc.local:
-    container_name: oathkeeper-auth-keyserver.trustbloc.local
-    image: oryd/oathkeeper:v0.38.4-alpine
-    ports:
-      - 4461:4461
-    command: /bin/sh -c "cp /etc/tls/ec-cacert.pem /usr/local/share/ca-certificates/;update-ca-certificates;oathkeeper serve proxy --config /oathkeeper/config.yaml"
-    user: root
-    entrypoint: ""
-    environment:
-      - LOG_LEVEL=debug
-      - PORT=4461
-      - ISSUER_URL=https://bdd-oathkeeper-auth-keyserver:4459
-      - SERVE_PROXY_TLS_KEY_PATH=/etc/tls/ec-key.pem
-      - SERVE_PROXY_TLS_CERT_PATH=/etc/tls/ec-pubCert.pem
-    volumes:
-      - ./oathkeeper-config/auth-keyserver:/oathkeeper
-      - ../keys/tls:/etc/tls
-
-  oathkeeper-ops-keyserver.trustbloc.local:
-    container_name: oathkeeper-ops-keyserver.trustbloc.local
-    image: oryd/oathkeeper:v0.38.4-alpine
-    ports:
-      - 4462:4462
-    command: /bin/sh -c "cp /etc/tls/ec-cacert.pem /usr/local/share/ca-certificates/;update-ca-certificates;oathkeeper serve proxy --config /oathkeeper/config.yaml"
-    user: root
-    entrypoint: ""
-    environment:
-      - LOG_LEVEL=debug
-      - PORT=4462
-      - ISSUER_URL=https://bdd-oathkeeper-ops-keyserver:4460
-      - SERVE_PROXY_TLS_KEY_PATH=/etc/tls/ec-key.pem
-      - SERVE_PROXY_TLS_CERT_PATH=/etc/tls/ec-pubCert.pem
-    volumes:
-      - ./oathkeeper-config/ops-keyserver:/oathkeeper
-      - ../keys/tls:/etc/tls