From 3a699de25ba35abf9e99998949e730dd4df8ecd9 Mon Sep 17 00:00:00 2001
From: Yoshino-s <cy-cui@outlook.com>
Date: Sun, 4 Jun 2023 14:32:40 +0000
Subject: [PATCH] fix: ci

---
 .gitlab-ci.yml                      | 7 ++-----
 docker/Dockerfile => Dockerfile     | 6 +++---
 docker/default.conf => default.conf | 0
 docker-compose.yml                  | 6 ++----
 4 files changed, 7 insertions(+), 12 deletions(-)
 rename docker/Dockerfile => Dockerfile (82%)
 rename docker/default.conf => default.conf (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 621f1cf..077d6f1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,8 @@
 image: alpine:latest
 
 variables:
-  CS_DEFAULT_BRANCH_IMAGE: $CI_REGISTRY_IMAGE/$CI_DEFAULT_BRANCH:$CI_COMMIT_SHA
-
-  CI_DEBUG_TRACE: "true"
-
-  CACHE_TTL: 2190h0m0s # three months
+  #CI_DEBUG_TRACE: "true"
+  CACHE_TTL: 2190h0m0s
 
 kaniko-build:
   variables:
diff --git a/docker/Dockerfile b/Dockerfile
similarity index 82%
rename from docker/Dockerfile
rename to Dockerfile
index f796ab5..90752d0 100644
--- a/docker/Dockerfile
+++ b/Dockerfile
@@ -14,12 +14,12 @@ COPY --from=deps /app/node_modules ./node_modules
 COPY . .
 
 RUN yarn build
- 
+
 FROM nginx:1.21-alpine AS runner
 
-COPY docker/default.conf /etc/nginx/conf.d/default.conf
+COPY default.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/dist /static
 
 EXPOSE 80
 
-CMD ["nginx", "-g", "daemon off;"]
\ No newline at end of file
+CMD ["nginx", "-g", "daemon off;"]
diff --git a/docker/default.conf b/default.conf
similarity index 100%
rename from docker/default.conf
rename to default.conf
diff --git a/docker-compose.yml b/docker-compose.yml
index fff3e85..a6b0d82 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,8 @@
 version: "3"
 services:
   ds-next:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
+    build: .
     container_name: ds-next
     restart: always
     ports:
-      - "9090:80"
\ No newline at end of file
+      - "9090:80"