- removed elastic and hashicorp from sample yaml

NoxOrg · Jul 12, 2023 · 5d0dcc8 · 5d0dcc8
1 parent e3475c6
commit 5d0dcc8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 92 deletions.
diff --git a/.nox/design/sample.solution.nox.yaml b/.nox/design/sample.solution.nox.yaml
@@ -495,9 +495,11 @@ infrastructure:
         port: 8080
         user: whatsappUser
         password: whatsappPassword
-
-    monitoring:
-      $ref: elastic.monitoring.nox.yaml
+
+### This section is optional.
+### In order to use elastic monitoring in the sample you have to start the elastic stack docker instance by running 'docker-compose -f docker-compose.elastic.yaml up -d'
+#    monitoring:
+#      $ref: elastic.monitoring.nox.yaml
 
     translations:
       name: SampleTranslationService
@@ -510,20 +512,22 @@ infrastructure:
         serverUri: file:///C:/my-data-files
         options: Source=File;Filename=country-data.json;
 
-  security:
-    secrets:
-      organizationSecretsServer:
-        name: org-vault
-        provider: hashicorpVault
-        serverUri: http://localhost:8300
-        password: root
-        validFor:
-          minutes: 10
-
-      solutionSecretsServer:
-        name: sln-vault
-        provider: hashicorpVault
-        serverUri: http://localhost:8300
-        password: root
-        validFor:
-          minutes: 10
+### This section is optional.
+### In order to use secrets in the sample you have to start the hashicorp vault docker instance by running 'docker-compose -f docker-compose.hashicorp.yaml up -d'
+#  security:
+#    secrets:
+#      organizationSecretsServer:
+#        name: org-vault
+#        provider: hashicorpVault
+#        serverUri: http://localhost:8300
+#        password: root
+#        validFor:
+#          minutes: 10
+#
+#      solutionSecretsServer:
+#        name: sln-vault
+#        provider: hashicorpVault
+#        serverUri: http://localhost:8300
+#        password: root
+#        validFor:
+#          minutes: 10
diff --git a/docker-compose.hashicorp.yml b/docker-compose.hashicorp.yml
@@ -9,10 +9,10 @@ services:
       - /vault/data
       - /etc/vault/logs
     ports:
-      - "8200:8200/tcp"
+      - "8300:8300/tcp"
     environment:
       VAULT_DEV_ROOT_TOKEN_ID: "root"
-      VAULT_DEV_LISTEN_ADDRESS: "0.0.0.0:8200"
+      VAULT_DEV_LISTEN_ADDRESS: "0.0.0.0:8300"
     cap_add:
       - IPC_LOCK
     entrypoint: "vault server -dev"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -34,73 +34,4 @@ services:
     volumes:
       - postgres:/var/lib/postgresql/data      
 
-  apm-server:
-    container_name: apm-server
-    image: docker.elastic.co/apm/apm-server:7.17.10
-    cap_add: ["CHOWN", "DAC_OVERRIDE", "SETGID", "SETUID"]
-    cap_drop: ["ALL"]
-    ports:
-    - 8200:8200
-    networks:
-    - elastic
-    command: >
-       apm-server -e
-         -E apm-server.rum.enabled=true
-         -E setup.kibana.host=kibana:5601
-         -E setup.template.settings.index.number_of_replicas=0
-         -E apm-server.kibana.enabled=true
-         -E apm-server.kibana.host=kibana:5601
-         -E output.elasticsearch.hosts=["elasticsearch:9200"]
-         -E apm-server.kibana.username=elastic
-         -E apm-server.kibana.password=Developer*123
-         -E output.elasticsearch.username=elastic
-         -E output.elasticsearch.password=Developer*123
-    healthcheck:
-      interval: 10s
-      retries: 12
-      test: curl --write-out 'HTTP %{http_code}' --fail --silent --output /dev/null http://localhost:8200/
-
-  vault:
-    container_name: hashi-vault
-    image: hashicorp/vault:latest
-    restart: always
-    volumes:
-      - /vault/data
-      - /etc/vault/logs
-    ports:
-      - "8300:8300/tcp"
-    environment:
-      VAULT_DEV_ROOT_TOKEN_ID: "root"
-      VAULT_DEV_LISTEN_ADDRESS: "0.0.0.0:8300"
-    cap_add:
-      - IPC_LOCK
-    entrypoint: "vault server -dev"
-    networks:
-      - vault-network
-
-  org-vault-init:
-    container_name: org-vault-init
-    image: alpine/curl
-    depends_on:
-      - vault
-    volumes:
-      - ./init_org_vault.sh:/usr/local/bin/init_vault.sh
-    command: ["sh", "-c", "/usr/local/bin/init_vault.sh"]
-    networks:
-      - vault-network
-
-  sln-vault-init:
-    container_name: sln-vault-init
-    image: alpine/curl
-    depends_on:
-      - vault
-    volumes:
-      - ./init_sln_vault.sh:/usr/local/bin/init_vault.sh
-    command: ["sh", "-c", "/usr/local/bin/init_vault.sh"]
-    networks:
-      - vault-network
 
-networks:
-  elastic:
-    driver: bridge
-  vault-network:
diff --git a/src/SampleWebApp/SampleWebApp.csproj b/src/SampleWebApp/SampleWebApp.csproj
@@ -41,7 +41,6 @@
 	</ItemGroup>
 
 	<ItemGroup>
-
 		<ProjectReference Include="..\Nox.Generator\Nox.Generator.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
 		<ProjectReference Include="..\Nox.Abstractions\Nox.Abstractions.csproj" />
 		<ProjectReference Include="..\Nox.Lib\Nox.Lib.csproj" />