diff --git a/Dockerfile b/.build/Dockerfile similarity index 100% rename from Dockerfile rename to .build/Dockerfile diff --git a/.build/docker-compose.yml b/.build/docker-compose.yml new file mode 100644 index 0000000..4b58487 --- /dev/null +++ b/.build/docker-compose.yml @@ -0,0 +1,6 @@ +version: '3.5' +services: +######################### + zabbix: + build: . + image: git.shihaam.dev/dockerfiles/zabbix-server diff --git a/startservices.sh b/.build/startservices.sh similarity index 100% rename from startservices.sh rename to .build/startservices.sh diff --git a/README.md b/README.md index 00b3eed..6109f6f 100644 --- a/README.md +++ b/README.md @@ -7,16 +7,15 @@ Mysql files are mounted at datadir. \ `startservices.sh` contain script to start `zabbix_server`, `nginx` and `php-fpm` ## Getting started -### Building +### Build and push to register - git clone and cd into git dir - Build zabbix image - cd into configdir and configure according to your set up. ```bash git clone https://git.shihaam.dev/dockerfiles/zabbix-server.git cd zabbix-server -docker compose -f docker-compose-build.yml build -docker compose -f docker-compose-build.yml up -d -xdg-open http://localhost:8000 +docker compose -f ./build/docker-compose.yml build +docker compose -f ./build/docker-compose.yml push ``` ### Running production @@ -25,6 +24,7 @@ xdg-open http://localhost:8000 git clone https://git.shihaam.dev/dockerfiles/zabbix-server.git cd zabbix-server docker-compose up -d +xdg-open http://localhost:8000 ``` - You will have Zabbix frontent avaible on port 8000 diff --git a/docker-compose-build.yml b/docker-compose-build.yml deleted file mode 100644 index 467272b..0000000 --- a/docker-compose-build.yml +++ /dev/null @@ -1,17 +0,0 @@ -version: '3.5' -services: -######################### - zabbix: - build: . - image: git.shihaam.dev/dockerfiles/zabbix-server - volumes: - - $PWD/configdir/etc/zabbix/zabbix_server.conf:/etc/zabbix/zabbix_server.conf - - $PWD/configdir/etc/zabbix/nginx.conf:/etc/zabbix/nginx.conf - - $PWD/configdir/etc/zabbix/web/zabbix.conf.php:/etc/zabbix/web/zabbix.conf.php - - $PWD/configdir/etc/php/7.4/fpm/php-fpm.conf:/etc/php/7.4/fpm/php-fpm.conf - - $PWD/datadir/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts - - $PWD/datadir/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts - ports: - - 8000:80 - - 10051:10051 - restart: always