From 7cf5aebe59ebe73751310648eac6966640bfcdec Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Thu, 4 May 2023 16:18:11 -0600 Subject: [PATCH 1/6] Fixed a configuration bug in compose-local.yaml. The name of the inventory service was changed from 'inventory' to 'inventory-service'. --- compose-local.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/compose-local.yaml b/compose-local.yaml index d23db67..87868da 100644 --- a/compose-local.yaml +++ b/compose-local.yaml @@ -56,7 +56,7 @@ services: ports: - 8080:8080 depends_on: - - inventory + - inventory-service - jms restart: on-failure environment: @@ -92,7 +92,7 @@ services: ports: - 9090:9090 depends_on: - - inventory + - inventory-service - beer-service - order-service - inventory-failover From 399472157be1c7062fb477944e57b4b000c0a3d1 Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Sat, 6 May 2023 16:52:23 -0600 Subject: [PATCH 2/6] Added a command: block to the filebeat: configuration in the compose-local.yaml. This fixes a bug when deploying filebeat to a Docker container running on Windows. --- compose-local.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-local.yaml b/compose-local.yaml index 87868da..5f6c1ef 100644 --- a/compose-local.yaml +++ b/compose-local.yaml @@ -20,6 +20,7 @@ services: - elasticsearch filebeat: image: docker.elastic.co/beats/filebeat:7.12.1 + command: filebeat -e -strict.perms=false volumes: - ./filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro # Configuration file - /var/lib/docker/containers:/var/lib/docker/containers:ro # Docker logs From 953dd5fbd7cdd80861f56b2bb01056aec9b8ac5c Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Sat, 6 May 2023 16:52:23 -0600 Subject: [PATCH 3/6] Added a command: block to the filebeat: configuration in the compose-local.yaml. This fixes a bug when deploying filebeat to a Docker container running on Windows. Closes #1. --- compose-local.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-local.yaml b/compose-local.yaml index 87868da..5f6c1ef 100644 --- a/compose-local.yaml +++ b/compose-local.yaml @@ -20,6 +20,7 @@ services: - elasticsearch filebeat: image: docker.elastic.co/beats/filebeat:7.12.1 + command: filebeat -e -strict.perms=false volumes: - ./filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro # Configuration file - /var/lib/docker/containers:/var/lib/docker/containers:ro # Docker logs From 736b9c6429fd5b4174b70a3bed28488c4240ec64 Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Sat, 6 May 2023 16:52:23 -0600 Subject: [PATCH 4/6] Added a command: block to the filebeat: configuration in the compose-local.yaml. This fixes a bug when deploying filebeat to a Docker container running on Windows. closes #1 --- compose-local.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-local.yaml b/compose-local.yaml index 87868da..5f6c1ef 100644 --- a/compose-local.yaml +++ b/compose-local.yaml @@ -20,6 +20,7 @@ services: - elasticsearch filebeat: image: docker.elastic.co/beats/filebeat:7.12.1 + command: filebeat -e -strict.perms=false volumes: - ./filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro # Configuration file - /var/lib/docker/containers:/var/lib/docker/containers:ro # Docker logs From fffa2feb9475e89068955b5c8ca63c0cbee15a22 Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Mon, 8 May 2023 09:20:12 -0600 Subject: [PATCH 5/6] Added a comment line to compose-local.yaml for Windows Docker deployment of filebeat server via Docker Compose startup. --- compose-local.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/compose-local.yaml b/compose-local.yaml index 5f6c1ef..c644102 100644 --- a/compose-local.yaml +++ b/compose-local.yaml @@ -20,6 +20,7 @@ services: - elasticsearch filebeat: image: docker.elastic.co/beats/filebeat:7.12.1 + # Uncomment the command: line below for a Windows-based filebeat Docker deployment: command: filebeat -e -strict.perms=false volumes: - ./filebeat/filebeat.docker.yml:/usr/share/filebeat/filebeat.yml:ro # Configuration file From ee5d969aec8cef3451f9b5d5de72dfa7b14fbdc0 Mon Sep 17 00:00:00 2001 From: Bill Lyons Date: Mon, 8 May 2023 15:05:58 -0600 Subject: [PATCH 6/6] Add .circleci/config.yml --- .circleci/config.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml new file mode 100644 index 0000000..4175da6 --- /dev/null +++ b/.circleci/config.yml @@ -0,0 +1,26 @@ +# Use the latest 2.1 version of CircleCI pipeline process engine. +# See: https://circleci.com/docs/configuration-reference +version: 2.1 + +# Define a job to be invoked later in a workflow. +# See: https://circleci.com/docs/configuration-reference/#jobs +jobs: + say-hello: + # Specify the execution environment. You can specify an image from Docker Hub or use one of our convenience images from CircleCI's Developer Hub. + # See: https://circleci.com/docs/configuration-reference/#executor-job + docker: + - image: cimg/base:stable + # Add steps to the job + # See: https://circleci.com/docs/configuration-reference/#steps + steps: + - checkout + - run: + name: "Say hello" + command: "echo Hello, World!" + +# Orchestrate jobs using workflows +# See: https://circleci.com/docs/configuration-reference/#workflows +workflows: + say-hello-workflow: + jobs: + - say-hello