From 8b69ad5c944064d141b26837980e2edada9705e6 Mon Sep 17 00:00:00 2001 From: subDesTagesMitExtraKaese Date: Sat, 13 Dec 2025 10:23:08 +0100 Subject: [PATCH] clean up readme and example files --- README.md | 15 +-------------- examples/docker-compose.baikal.yaml | 14 -------------- examples/docker-compose.yaml | 14 -------------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/README.md b/README.md index dc5e553..d49ff75 100644 --- a/README.md +++ b/README.md @@ -46,7 +46,7 @@ From [inf-it.com/open-source/clients/infcloud](https://www.inf-it.com/open-sourc ## How to use this image -This image serves the static content with [nginx](http://nginx.org/) and renders the PHP files with [PHP-FPM](https://hub.docker.com/_/php#phpversion-fpm). +This image serves the static content with [nginx](http://nginx.org/). This repository contains a Docker Compose example in [examples/docker-compose.yaml](https://github.com/ckulka/infcloud-docker/blob/master/examples/docker-compose.yaml) to give an easy example: @@ -55,12 +55,6 @@ This repository contains a Docker Compose example in [examples/docker-compose.ya docker-compose up ``` -If you only need the static files without PHP, you can also just run the Nginx container: - -```bash -docker run --rm -it -v config.js:/usr/share/nginx/html/config.js:ro -p 80:80 ckulka/infcloud -``` - Then you can hit [http://localhost](http://localhost) or [http://host-ip](http://host-ip) in your browser and use InfCloud. The last step is to configure InfCloud; for setup instructions see the official [readme.txt](https://www.inf-it.com/infcloud/readme.txt) and comments in InfCloud's [config.js](https://www.inf-it.com/infcloud/config.js.txt). @@ -82,13 +76,6 @@ Once all that is done, go to [http://infcloud.localhost/](http://infcloud.localh The only adjustment in this example to the [examples/config-baikal.js](https://github.com/ckulka/infcloud-docker/blob/master/examples/config-baikal.js#L335) file were modifications to the `globalNetworkCheckSettings.href` settings. -## FAQ - -### Why not one image with Nginx + PHP? - -The main reason to not package PHP _and_ Nginx (or Apache httpd) in the same container is maintainablility. - -By leveraging the official PHP image instead of installing PHP into the Nginx container, users can benefit from timely updates being made to the official PHP image and do not have to wait for this image to be updated. This image is also built automatically by Docker Hub whenever a new version of Nginx is published. diff --git a/examples/docker-compose.baikal.yaml b/examples/docker-compose.baikal.yaml index 13966d5..33a4241 100644 --- a/examples/docker-compose.baikal.yaml +++ b/examples/docker-compose.baikal.yaml @@ -8,28 +8,17 @@ # 1. Go to Baikal Settings (http://baikal.localhost/admin/?/settings/standard/) # 2. Change "WebDAV authentication type" to "Basic" -version: "2" - services: infcloud: image: ckulka/infcloud restart: always - depends_on: - - php labels: traefik.enable: "true" traefik.frontend.rule: "Host: infcloud.localhost" traefik.port: 80 volumes: - - infcloud:/usr/share/nginx/infcloud - ./config-baikal.js:/usr/share/nginx/infcloud/config.js:ro - php: - image: php:7.3-fpm-alpine - restart: always - volumes: - - infcloud:/usr/share/nginx/infcloud:ro - # IMPORTANT: For current configuration examples, see # - Simple Baikal example: https://github.com/ckulka/baikal-docker/blob/master/examples/docker-compose.yaml # - Traefik/SSL example: https://github.com/ckulka/baikal-docker/blob/master/examples/docker-compose.ssl.yaml @@ -58,6 +47,3 @@ services: - --accesslog - --docker - --docker.exposedByDefault=false - -volumes: - infcloud: diff --git a/examples/docker-compose.yaml b/examples/docker-compose.yaml index aa2f9b0..668f230 100644 --- a/examples/docker-compose.yaml +++ b/examples/docker-compose.yaml @@ -1,22 +1,8 @@ -version: "3" - services: infcloud: image: ckulka/infcloud restart: always - depends_on: - - php ports: - "80:80" volumes: - - infcloud:/usr/share/nginx/infcloud - ./config.js:/usr/share/nginx/infcloud/config.js:ro - - php: - image: php:7.3-fpm-alpine - restart: always - volumes: - - infcloud:/usr/share/nginx/infcloud:ro - -volumes: - infcloud: