diff --git a/README.md b/README.md index 1ab8e2f..7190250 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,6 @@ Welcome to homesrv01.dev.lan git page. - [Telegraf](#telegraf) - [Setup \& Update](#setup--update) - [nginx](#nginx) - - [Setup \& Update](#setup--update-1) - [code-server](#code-server) - [Home Assistant](#home-assistant) - [LMS](#lms) @@ -128,11 +127,9 @@ maintained by ansible myInfra.docker.telegraf role ### nginx -#### Setup & Update +Using portainer stack (stack name: nginx) connected to this repo. [Docker Compose](./services/nginx/docker-compose.yaml) -``` bash -services/nginx/docker-run.sh -``` +All configuration is set during docker build. ### code-server diff --git a/scripts/auto-update.sh b/scripts/auto-update.sh index 334125b..3b360db 100755 --- a/scripts/auto-update.sh +++ b/scripts/auto-update.sh @@ -3,8 +3,8 @@ scriptPath="$(dirname "$(readlink -f "$0")")" doWork(){ apt update -y apt upgrade -y - $scriptPath/../services/nginx/docker-run.sh - docker image prune -f +# $scriptPath/../services/nginx/docker-run.sh +# docker image prune -f } doWork 2>&1 | logger -s -t "auto-update" exit 0 diff --git a/services/nginx/docker-compose.yaml b/services/nginx/docker-compose.yaml index c584690..a57d3f3 100644 --- a/services/nginx/docker-compose.yaml +++ b/services/nginx/docker-compose.yaml @@ -1,9 +1,11 @@ version: '3' services: nginx: - image: nginx + build: + context: ./docker + pull_policy: build + image: homesrv/nginx:latest volumes: - - ./volumes/nginx_conf:/etc/nginx/conf.d - etc_ssl:/etc/ssl ports: - 443:443 diff --git a/services/nginx/docker-run.sh b/services/nginx/docker-run.sh deleted file mode 100755 index ddd9d0d..0000000 --- a/services/nginx/docker-run.sh +++ /dev/null @@ -1,9 +0,0 @@ -#! /bin/bash -scriptPath="$(dirname "$(readlink -f "$0")")" -currentPath=$PWD - -cd $scriptPath -docker compose pull -docker compose up --force-recreate --build -d -cd $currentPath - diff --git a/services/nginx/docker/Dockerfile b/services/nginx/docker/Dockerfile new file mode 100644 index 0000000..c2bb235 --- /dev/null +++ b/services/nginx/docker/Dockerfile @@ -0,0 +1,4 @@ +FROM nginx:latest + +COPY nginx.conf.d/* /etc/nginx/conf.d + diff --git a/services/nginx/volumes/nginx_conf/default.conf b/services/nginx/docker/nginx.conf.d/default.conf similarity index 100% rename from services/nginx/volumes/nginx_conf/default.conf rename to services/nginx/docker/nginx.conf.d/default.conf diff --git a/services/nginx/volumes/nginx_conf/has.conf b/services/nginx/docker/nginx.conf.d/has.conf similarity index 100% rename from services/nginx/volumes/nginx_conf/has.conf rename to services/nginx/docker/nginx.conf.d/has.conf