diff --git a/.env b/.env index d73f21df..139952fb 100644 --- a/.env +++ b/.env @@ -4,7 +4,7 @@ # The IP below should be swapped to your real IP or DNS name, like 192.168.88.248, etc. if testing from remote browsers or mobile devices -ESHOP_EXTERNAL_DNS_NAME_OR_IP=localhost +ESHOP_EXTERNAL_DNS_NAME_OR_IP=192.168.1.19 # If the NAMESPACE env var is set, Dapr does not load any # component that does not specify the same namespace. diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 00000000..6e737461 --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,36 @@ +# This is a basic workflow to help you get started with Actions + +name: CI + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the main branch + push: + branches: [ main ] + pull_request: + branches: [ main ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + + # Runs a single command using the runners shell + - name: Run a one-line script + run: echo Hello, world! + + # Runs a set of commands using the runners shell + - name: Run a multi-line script + run: | + echo Add other actions to build, + echo test, and deploy your project. diff --git a/.gitignore b/.gitignore index c47ba2d1..a8b8f665 100644 --- a/.gitignore +++ b/.gitignore @@ -374,4 +374,20 @@ MigrationBackup/ **/tempkey.rsa # macOS files -.DS_Store \ No newline at end of file +.DS_Store +/src/ApiGateways/Aggregators/Web.Shopping.HttpAggregator/.aspnet/DataProtection-Keys/key-26c59856-9ff6-469a-8a7c-d954f1b1669b.xml +/src/Services/Basket/Basket.API/.aspnet/DataProtection-Keys/key-c48680ef-d1e0-4988-9486-e0f1bfb2f268.xml +/src/Services/Identity/Identity.API/.aspnet/DataProtection-Keys/key-986ee17b-ff21-4a99-8917-f348faa16819.xml +/src/Services/Identity/Identity.API/keys/is-signing-key-EAA68BA13C0497676FE6C8154E4CB60D.json +/src/Services/Identity/Identity.API/keys/is-signing-key-C773B66C065AB0FF099B1FA96A8DA508.json +/src/Services/Identity/Identity.API/keys/is-signing-key-C13A9A73D69887B49EE224B7610EE44B.json +/src/Services/Identity/Identity.API/keys/is-signing-key-A146395E40C2B5665F0A76377B3E49BC.json +/src/Services/Identity/Identity.API/keys/is-signing-key-9C9A36C9FFCF89F1ED6BA432240C2E8C.json +/src/Services/Identity/Identity.API/keys/is-signing-key-6DDC6082EC29A1BB9CE5AD77483AF126.json +/src/Services/Identity/Identity.API/keys/is-signing-key-511F2270F9ECDA692F2CD351C2E3FD8A.json +/src/Services/Identity/Identity.API/keys/is-signing-key-3E93D8BFF96E2B87F1278BF88CC89461.json +/src/Services/Identity/Identity.API/keys/is-signing-key-245BE88025479B3CBC04D33D8F04B6DB.json +/src/Services/Identity/Identity.API/keys/is-signing-key-23AFA9F9104D9AA570D6C4771A65ABFA.json +/src/Services/Identity/Identity.API/keys/is-signing-key-22B27C69702109C30DDF13C5E8E156D8.json +/src/Services/Ordering/Ordering.API/.aspnet/DataProtection-Keys/key-b0c35976-b46c-41ab-8f3a-710334bfb345.xml +/src/Web/BlazorClient.Host/.aspnet/DataProtection-Keys/key-5495f7e4-a7fb-4723-a26b-613c3969fb3f.xml diff --git a/dapr/components/eshop-pubsub.yaml b/dapr/components/eshop-pubsub.yaml index f4235d45..f2192ca1 100644 --- a/dapr/components/eshop-pubsub.yaml +++ b/dapr/components/eshop-pubsub.yaml @@ -8,7 +8,7 @@ spec: version: v1 metadata: - name: host - value: "amqp://rabbitmq:5672" + value: "amqps://nyipabyg:FUcLCU1Ur-giK6WBtiAiwDJPBJGmB1Ru@gerbil.rmq.cloudamqp.com/nyipabyg" - name: durable value: "false" - name: deletedWhenUnused diff --git a/docker-compose.override.yml b/docker-compose.override.yml index 2e809122..16a485f6 100644 --- a/docker-compose.override.yml +++ b/docker-compose.override.yml @@ -13,7 +13,7 @@ services: rabbitmq: ports: - - "5672:5672" + - "4672:5672" redis: image: redis:alpine @@ -31,7 +31,7 @@ services: - SA_PASSWORD=Pass@word - ACCEPT_EULA=Y ports: - - "5433:1433" + - "2433:1433" volumes: - eshop-sqldata:/var/opt/mssql diff --git a/docs/media/zipkin-WEBSHOPPINGAPIGW.png b/docs/media/zipkin-WEBSHOPPINGAPIGW.png new file mode 100644 index 00000000..6ecd68c2 Binary files /dev/null and b/docs/media/zipkin-WEBSHOPPINGAPIGW.png differ