From bbf5826b0f00c53fe2e6348b1b166530cdb52a53 Mon Sep 17 00:00:00 2001
From: Lulzette <ivan@lulzette.ru>
Date: Sun, 21 May 2023 08:45:59 +0300
Subject: [PATCH] Simpify pipeline

---
 .drone.yml      | 32 +++-----------------------------
 Dockerfile      |  6 ------
 Makefile        | 11 ++++++++++-
 docker-entry.sh |  3 ---
 4 files changed, 13 insertions(+), 39 deletions(-)
 delete mode 100644 Dockerfile
 delete mode 100755 docker-entry.sh

diff --git a/.drone.yml b/.drone.yml
index c2cfcae..1cd1e50 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,38 +1,12 @@
----
-kind: pipeline
-type: exec
-name: build image
-
-steps: 
-  - name: build
-    commands:
-      - docker build . -t git.lulzette.ru/lulzette/geeksstuffwiki:latest
-  - name: login
-    commands:
-      - docker login git.lulzette.ru -u lulzette -p $gitea_key
-    environment:
-      gitea_key:
-        from_secret: gitea_key
-  - name: push
-    commands:
-      - docker push git.lulzette.ru/lulzette/geeksstuffwiki:latest
-
 ---
 kind: pipeline
 type: exec
 name: deploy
 
 steps: 
-  - name: Run image
-    commands: 
-      - docker run --name docs -p 8000:8000 -d git.lulzette.ru/lulzette/geeksstuffwiki:latest
+  - name: Make
+    commands:
+      - make
 
-trigger:
-  event:
-  - promote
-  target:
-  - production
 node:
   target: geeksstuffwiki
-depends_on:
-  - build image
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index ad2645b..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-FROM alpine:3.16.3
-RUN apk update && apk add py-pip make
-COPY . /app
-RUN cd /app && make prepare && make build
-CMD [ "/app/docker-entry.sh" ]
-EXPOSE 8000
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 37672ac..a2b30bc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,9 @@
 all: build serve
+
+local_build: prepare build upload_to_srv clean
+
+drone_build: prepare build copy_to_dir unprepare clean
+
 build:
 	mkdocs build
 clean:
@@ -9,6 +14,10 @@ unprepare:
 	pip uninstall mkdocs mkdocs-windmill-dark
 serve:
 	mkdocs serve
-upload: prepare build upload_to_srv	clean
+
 upload_to_srv:
 	rsync -a -P --delete `pwd`/site/ geekwiki:/srv/http/
+
+copy_to_dir:
+	cp -r /srv/http /srv/http_${DRONE_BUILD_NUMBER}
+	rsync -a -P --delete `pwd`/site/ /srv/http/
diff --git a/docker-entry.sh b/docker-entry.sh
deleted file mode 100755
index 41cfb3f..0000000
--- a/docker-entry.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-cd /app
-mkdocs serve
\ No newline at end of file