[PR #1001] [MERGED] Docker refresh #1203

New issue

Closed

opened 2026-02-25 21:37:32 +03:00 by kerem · 0 comments

kerem commented

2026-02-25 21:37:32 +03:00

Owner

📋 Pull Request Information

Original PR: https://github.com/cypht-org/cypht/pull/1001
Author: @jonocodes
Created: 5/3/2024
Status: ✅ Merged
Merged: 5/25/2024
Merged by: @marclaporte

Base: master ← Head: docker-refresh

📝 Commits (10+)

5f2eac3 Docker files in local directory
8719555 Add some TODO notes
3330548 Working on db setup script
6efb14d User creating with sqlite working
b6a2a84 Better error handling when creating user
62c3a86 Healthcheck. Makefile. setup_system script
572290a entrypoint cleanup
58fb25c adding push and test to makefile
4bbf969 Move run time data into local data dir.
562cc53 fpm logging is now working

📊 Changes

16 files changed (+463 additions, -11 deletions)

View changed files

➕ .dockerignore (+2 -0)
📝 .gitignore (+3 -1)
➕ Makefile (+35 -0)
📝 composer.lock (+0 -1)
➕ docker-compose.dev.yaml (+44 -0)
➕ docker/DOCKERHUB-README.md (+48 -0)
➕ docker/Dockerfile (+62 -0)
➕ docker/docker-compose.yaml (+32 -0)
➕ docker/docker-entrypoint.sh (+37 -0)
➕ docker/nginx.conf (+40 -0)
➕ docker/supervisord.conf (+22 -0)
📝 lib/auth.php (+1 -0)
📝 lib/framework.php (+2 -0)
📝 scripts/create_account.php (+4 -9)
➕ scripts/setup_database.php (+96 -0)
➕ scripts/setup_system.sh (+35 -0)

📄 Description

Goal

The primary goal is to simplify the docker setup and make it as similar as possible to the local development setup. Some of the changes include:

moving docker files to a /docker/ dir
adding a docker compose file
moving the db setup script into the scripts dir
having the startup use the local env vars instead of replacing vars in files with sed
create a makefile which is used as directions for running, pushing, building, etc.

Running the official image

This uses the image from dockerhub.

See setup instructions here: https://hub.docker.com/r/jonocodes/cypht

or use the local docker compose file:

cd docker
docker compose up

Then visit http://localhost

Running docker for development

This uses the the current checked out code in a docker container for development. You can edit source files while it running:

make docker-up

Then visit http://localhost

Status

roughly tested using mysql and sqlite
not tested with pgsql, redis, memcached

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/cypht-org/cypht/pull/1001 **Author:** [@jonocodes](https://github.com/jonocodes) **Created:** 5/3/2024 **Status:** ✅ Merged **Merged:** 5/25/2024 **Merged by:** [@marclaporte](https://github.com/marclaporte) **Base:** `master` ← **Head:** `docker-refresh` --- ### 📝 Commits (10+) - [`5f2eac3`](https://github.com/cypht-org/cypht/commit/5f2eac393b9ab68c6dc4691ebd2f01ed16940019) Docker files in local directory - [`8719555`](https://github.com/cypht-org/cypht/commit/87195551face39ecb1bb246770d6a28b6e62f370) Add some TODO notes - [`3330548`](https://github.com/cypht-org/cypht/commit/3330548b9fa3dc8c1593b834efecb51051350be3) Working on db setup script - [`6efb14d`](https://github.com/cypht-org/cypht/commit/6efb14de74f2d2c728313511845b1556bc4d3385) User creating with sqlite working - [`b6a2a84`](https://github.com/cypht-org/cypht/commit/b6a2a84ce90efc8918c402703665d16d0f70f589) Better error handling when creating user - [`62c3a86`](https://github.com/cypht-org/cypht/commit/62c3a86045f80bacbe9748cd0d016c947fe9b17c) Healthcheck. Makefile. setup_system script - [`572290a`](https://github.com/cypht-org/cypht/commit/572290a9af373af0877ef0ba5eb63aa75ac88d0f) entrypoint cleanup - [`58fb25c`](https://github.com/cypht-org/cypht/commit/58fb25cfc09064b1a2940ade3ed750c67cbd5d9b) adding push and test to makefile - [`4bbf969`](https://github.com/cypht-org/cypht/commit/4bbf9695a369822389f101447cb821a9168a6f1f) Move run time data into local data dir. - [`562cc53`](https://github.com/cypht-org/cypht/commit/562cc53e4af154546039953f0e6f200d71754e6f) fpm logging is now working ### 📊 Changes **16 files changed** (+463 additions, -11 deletions) <details> <summary>View changed files</summary> ➕ `.dockerignore` (+2 -0) 📝 `.gitignore` (+3 -1) ➕ `Makefile` (+35 -0) 📝 `composer.lock` (+0 -1) ➕ `docker-compose.dev.yaml` (+44 -0) ➕ `docker/DOCKERHUB-README.md` (+48 -0) ➕ `docker/Dockerfile` (+62 -0) ➕ `docker/docker-compose.yaml` (+32 -0) ➕ `docker/docker-entrypoint.sh` (+37 -0) ➕ `docker/nginx.conf` (+40 -0) ➕ `docker/supervisord.conf` (+22 -0) 📝 `lib/auth.php` (+1 -0) 📝 `lib/framework.php` (+2 -0) 📝 `scripts/create_account.php` (+4 -9) ➕ `scripts/setup_database.php` (+96 -0) ➕ `scripts/setup_system.sh` (+35 -0) </details> ### 📄 Description # Goal The primary goal is to simplify the docker setup and make it as similar as possible to the local development setup. Some of the changes include: * moving docker files to a /docker/ dir * adding a docker compose file * moving the db setup script into the scripts dir * having the startup use the local env vars instead of replacing vars in files with sed * create a makefile which is used as directions for running, pushing, building, etc. # Running the official image This uses the image from dockerhub. See setup instructions here: https://hub.docker.com/r/jonocodes/cypht or use the local docker compose file: ``` cd docker docker compose up ``` Then visit http://localhost # Running docker for development This uses the the current checked out code in a docker container for development. You can edit source files while it running: ``` make docker-up ``` Then visit http://localhost # Status * roughly tested using mysql and sqlite * not tested with pgsql, redis, memcached --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>