From ade5aee1ec186c045f9ec13e197c3d69a68d564b Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sat, 5 Jun 2021 14:50:43 +0300
Subject: [PATCH 1/4] add workdir

---
 docker-compose.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-compose.yml b/docker-compose.yml
index f5256a0..1c5b697 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -14,4 +14,5 @@ services:
     volumes:
       - ./etc/instance/config:/config
       - /var/services/homes/fedy95:/var/services/homes/fedy95
+    working_dir: /var/services/homes/fedy95
 ...
-- 
2.30.2


From 74e9a2495045b97b0e0018417c5921a3468e7797 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sat, 5 Jun 2021 14:52:35 +0300
Subject: [PATCH 2/4] add yamllint

---
 .drone.yml | 15 +++++++++++++++
 Makefile   | 14 ++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 .drone.yml
 create mode 100644 Makefile

diff --git a/.drone.yml b/.drone.yml
new file mode 100644
index 0000000..d8ace9a
--- /dev/null
+++ b/.drone.yml
@@ -0,0 +1,15 @@
+---
+kind: pipeline
+type: docker
+name: pull_request
+image_pull_secrets:
+  - dockerconfigjson
+
+steps:
+  - name: lint yaml
+    image: registry.fedy95.com/baseimage-yamllint:latest
+    commands:
+      - yamllint -c /yamllint/relaxed.yaml docker-compose.yml
+    when:
+      event: pull_request
+...
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..83037ff
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,14 @@
+MAKEFLAGS += --silent
+.PHONY: *
+
+REGISTRY=registry.fedy95.com
+YAMLLINT_TAG=baseimage-yamllint:latest
+
+lint: lint-yaml
+
+LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
+lint-yaml:
+	docker pull ${REGISTRY}/${YAMLLINT_TAG}
+	$(LINT-YAML-CMD) docker-compose.yml
+
+.DEFAULT_GOAL := lint
-- 
2.30.2


From c675abad7fa1c49b99efdc59ae265c5aa94d10c9 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sat, 5 Jun 2021 14:55:04 +0300
Subject: [PATCH 3/4] add-badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7babc8c..8a33e74 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
-### openssh-server
+### openssh-server [![Build Status](https://drone.fedy95.com/api/badges/infra/openssh-server/status.svg)](https://drone.fedy95.com/infra/openssh-server)
 
 - [docker hub](https://hub.docker.com/r/linuxserver/openssh-server)
-- 
2.30.2


From dc17dc045d07efcab6028a911259931c1bfe4ff3 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Sat, 5 Jun 2021 15:05:57 +0300
Subject: [PATCH 4/4] add additional packages

---
 Dockerfile         | 3 +++
 Makefile           | 9 +++++++++
 docker-compose.yml | 7 ++++---
 3 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ad55a78
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,3 @@
+FROM linuxserver/openssh-server
+
+RUN apk --no-cache add git make
diff --git a/Makefile b/Makefile
index 83037ff..df210d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,13 @@
 MAKEFLAGS += --silent
 .PHONY: *
 
+LOCAL_REPOSITORY=fedy95/infra:openssh-server
+PLANTUML_TAG=latest
+
+build:
+	docker build -t ${LOCAL_REPOSITORY}-${PLANTUML_TAG} .
+
+
 REGISTRY=registry.fedy95.com
 YAMLLINT_TAG=baseimage-yamllint:latest
 
@@ -11,4 +18,6 @@ lint-yaml:
 	docker pull ${REGISTRY}/${YAMLLINT_TAG}
 	$(LINT-YAML-CMD) docker-compose.yml
 
+
+
 .DEFAULT_GOAL := lint
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c5b697..13db281 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -3,7 +3,8 @@ version: "3"
 
 services:
   instance:
-    image: linuxserver/openssh-server
+    build:
+      context: .
     container_name: openssh-server
     hostname: openssh-server
     restart: always
@@ -13,6 +14,6 @@ services:
     env_file: env/instance.env
     volumes:
       - ./etc/instance/config:/config
-      - /var/services/homes/fedy95:/var/services/homes/fedy95
-    working_dir: /var/services/homes/fedy95
+      - /var/services/homes/fedy95:/home/fedy95
+    working_dir: /home/fedy95
 ...
-- 
2.30.2