From dc17dc045d07efcab6028a911259931c1bfe4ff3 Mon Sep 17 00:00:00 2001 From: fedy95 Date: Sat, 5 Jun 2021 15:05:57 +0300 Subject: [PATCH] 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 ...