From 9e262d215a9dbdd2c8768984927304893c73d8ed Mon Sep 17 00:00:00 2001 From: cabbage556 Date: Mon, 3 Apr 2023 10:55:01 +0900 Subject: [PATCH] =?UTF-8?q?chore:=20=EB=B2=84=EC=A0=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile.logstash | 2 +- docker-compose.yaml | 2 +- package.json | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Dockerfile.logstash b/Dockerfile.logstash index 30b4f01..05f374d 100644 --- a/Dockerfile.logstash +++ b/Dockerfile.logstash @@ -1,4 +1,4 @@ -FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:7.0.0 +FROM opensearchproject/logstash-oss-with-opensearch-output-plugin:7.16.2 COPY ./elk/logstash/logstash.prod.conf /usr/share/logstash/pipeline/ COPY ./elk/logstash/mysql-connector-java-8.0.28.jar /usr/share/logstash/ diff --git a/docker-compose.yaml b/docker-compose.yaml index 146621f..2fe8367 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -16,7 +16,7 @@ services: # platform: linux/86_64 image: mysql:latest environment: - MYSQL_DATABASE: 'groo-meong' + MYSQL_DATABASE: 'groomeong' MYSQL_ROOT_PASSWORD: 'root' ports: - 3306:3306 diff --git a/package.json b/package.json index e83ed1c..26fa155 100644 --- a/package.json +++ b/package.json @@ -22,11 +22,7 @@ }, "dependencies": { "@apollo/server": "^4.5.0", -<<<<<<< HEAD - "@elastic/elasticsearch": "^7.0.0", -======= "@elastic/elasticsearch": "7.13.0", ->>>>>>> 7865a492a12584e16382eabddf53ab547553938a "@google-cloud/storage": "^6.9.3", "@nestjs-modules/mailer": "^1.8.1", "@nestjs/apollo": "^10.1.7",