From 9103180c3619aafc1c76b347b690eaadbbf5ba2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn-Michael=20Miehe?= <jmmiehe@gmx.de>
Date: Mon, 8 Jan 2024 18:24:50 +0100
Subject: [PATCH] remove root compose file for a Makefile; move Dockerfile;
 adjust drone file

---
 .drone.yml                   |  2 --
 src/Dockerfile => Dockerfile |  5 +++--
 Makefile                     | 24 ++++++++++++++++++++++++
 docker-compose.yml           | 16 ----------------
 4 files changed, 27 insertions(+), 20 deletions(-)
 rename src/Dockerfile => Dockerfile (70%)
 create mode 100644 Makefile
 delete mode 100644 docker-compose.yml

diff --git a/.drone.yml b/.drone.yml
index 876d85d..a5119a0 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -7,8 +7,6 @@ steps:
   image: plugins/docker
   settings:
     repo: ldericher/autodoc
-    context: src
-    dockerfile: src/Dockerfile
     auto_tag: true
     username:
       from_secret: DOCKER_USERNAME
diff --git a/src/Dockerfile b/Dockerfile
similarity index 70%
rename from src/Dockerfile
rename to Dockerfile
index 10600f7..0933772 100644
--- a/src/Dockerfile
+++ b/Dockerfile
@@ -8,6 +8,7 @@ RUN set -ex; \
       make \
     ;
 
-COPY usr /usr
+COPY src/usr /usr
 
-CMD ["autodoc", "-bw"]
+ENTRYPOINT ["autodoc"]
+CMD ["-bw"]
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..c3e0c78
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,24 @@
+image_tag = ldericher/autodoc
+docker_build = docker build
+docker_run = docker run --rm -it
+examples_flags = -v "$(shell pwd)/examples:/data" -u "$(shell id -u):$(shell id -g)"
+
+.PHONY: default
+default:
+	$(info use other targets: image build watch clean)
+
+.PHONY: image
+image:
+	$(docker_build) --tag $(image_tag) ./
+
+.PHONY: build
+build: image
+	$(docker_run) $(examples_flags) $(image_tag) -b
+
+.PHONY: watch
+watch: image
+	$(docker_run) $(examples_flags) $(image_tag)
+
+.PHONY: clean
+clean:
+	git clean -xdf ./examples
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
deleted file mode 100644
index 7f5fb2e..0000000
--- a/docker-compose.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "2"
-
-services:
-  autodoc:
-    restart: "no"
-
-    image: ldericher/autodoc
-    build:
-      context: ./src
-
-    command: "bash"
-
-    volumes:
-      - "${PWD}/src/usr/local/bin/autodoc:/usr/local/bin/autodoc:ro"
-      - "${PWD}/src/usr/local/lib/autodoc:/usr/local/lib/autodoc:ro"
-      - "${PWD}/examples:/docs"