From 76ffbb1b8437efa113c27dca943ca6dd29965752 Mon Sep 17 00:00:00 2001
From: Administrator <zyb2514@126.com>
Date: Sun, 12 May 2024 23:10:34 +0800
Subject: [PATCH] new

---
 .gitlab-ci.yml           |  4 +---
 docker-compose-nacos.yml | 13 -------------
 docker-compose.yml       |  9 ++++++++-
 3 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 docker-compose-nacos.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 022aeb1..d0679d0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,9 +7,6 @@ stages:
 build:
   stage: build
   script:
-    - sudo docker-compose down
-    - sudo docker-compose -f docker-compose-nacos.yml down
-    - sudo docker-compose -f docker-compose-nacos.yml up -d
     - mvn clean package
     - sudo docker build -t library-service ./library
     - sudo docker build -t gateway-service ./gateway
@@ -17,4 +14,5 @@ build:
 deploy:
   stage: deploy
   script:
+    - sudo docker-compose down
     - sudo docker-compose up -d
diff --git a/docker-compose-nacos.yml b/docker-compose-nacos.yml
deleted file mode 100644
index ad3df4e..0000000
--- a/docker-compose-nacos.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: '3'
-services:
-  nacos:
-    image: nacos/nacos-server:2.0.2
-    networks:
-      - mynetwork
-    ports:
-      - "8849:8848"
-    environment:
-      MODE: "standalone"
-
-networks:
-  mynetwork:
diff --git a/docker-compose.yml b/docker-compose.yml
index 38b1b23..c9e221b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,7 +14,14 @@ services:
     networks:
       - mynetwork
 
-
+  nacos:
+    image: nacos/nacos-server:2.0.2
+    networks:
+      - mynetwork
+    ports:
+      - "8849:8848"
+    environment:
+      MODE: "standalone"
 
   library:
     image: library-service