dev #2

Merged

webmaster merged 34 commits from dev into main 2025-12-20 20:04:57 +00:00

Conversation 0 Commits 34 Files Changed 11 +666 -25

webmaster commented 2025-12-20 20:02:57 +00:00

Owner

Copy Link

No description provided.

webmaster added 34 commits 2025-12-20 20:02:58 +00:00

add Docker configuration files and deployment guide b5443ddcee

Merge pull request 'add Docker configuration files and deployment guide' (#1) from feat/docker-config into dev ... a6b2ea3a14

Reviewed-on: #1

Add CI/CD workflows for development and production deployments ... 0cedc90031

- Created `deploy-dev.yml` for automated deployment to the development server on push to the `dev` branch.
- Created `deploy.yml` for automated deployment to the production server on push to the `main` or `master` branches.
- Added deployment instructions in `DEPLOYMENT-PORTAINER.md` for using Portainer and Traefik.
- Documented Gitea Actions deployment process in `DEPLOYMENT.md`.
- Configured Traefik SSL settings in `TRAEFIK-SSL-CONFIG.md` for both development and production environments.
- Implemented a deployment script `deploy.sh` for manual deployments.
- Added Docker Compose configurations for development (`docker-compose.portainer.dev.yml`) and production (`docker-compose.portainer.yml`) environments.
- Updated main `docker-compose.yml` to support Traefik integration and environment variable configurations.

Update domain references from merchbay.app to merchbay.com in configuration files c72e03f282

Refactor deployment workflows to streamline code checkout and file transfer processes a12ee2e5aa

Refactor deployment scripts to use GitHub environment variables and improve SSH key handling 6f7b81f1da

Refactor deployment workflows to enhance SSH handling and streamline Docker image deployment fa59a081d8

Add container specification and shell definitions to deployment workflows af0d8cd9ac

Enhance deployment workflows with additional input parameters and setup scripts a4171330e5

Refactor SSH setup in deployment workflows to enhance security and error handling 632f143637

Update domain and application URL to dev-admin.merchbay.app across deployment configurations 63c5c50578

Refactor deployment workflow by removing unnecessary input parameters and enhancing SSH setup for improved security and reliability 9d0bae2dea

Fix SSH key variable in deployment workflow for consistency and security 74860f8a0d

Enhance SSH setup in deployment workflow to include error handling for empty SSH key aaa043f06e

Refactor SSH setup in deployment workflow to enhance secrets presence checks and improve output clarity 8e8bfd1897

Enhance deployment workflow by adding SSH setup and secret validation checks for improved security and reliability 73b178fa2c

Update deployment paths in workflow and remove versioning from docker-compose 676988fabb

Refactor secrets debug step in deployment workflow for clarity and efficiency 3ca2983c68

Update deployment directory path in workflow from /home/deploy/apps to /var/www/apps for consistency e9620052f7

Refactor deployment workflow to streamline SSH setup and improve image building process f2081217af

Update artifact upload paths in deployment workflow for accuracy 183d19848b

Add .env.example file and update docker-compose configurations for environment variables 7fb6a74a13

Fix .env permissions to ensure proper access during deployment 58e36c420c

Add cache clearing step during deployment to optimize application performance 946f968ca0

Enhance deployment script to clear and rebuild config cache for improved performance 159dda3843

Enhance health check in deployment workflow and suppress Apache ServerName warning in Dockerfile 2550a945a3

Fix: Create storage directories and set proper permissions 110c0f7291

Enhance AppServiceProvider to force HTTPS when behind a proxy 58e1bad1cf

Fix typo in AppServiceProvider to use forceSchema instead of forceScheme 075c6bfdf9

Remove outdated deployment and configuration files; consolidate deployment instructions into README and update project structure. 246f6b2c0f

Update deployment scripts to specify required environment variables in .env file and docker-compose e45cfb5ebd

Enhance deployment workflows to remove old Docker images and prune unused resources 39abf1b5fc

Enhance Docker cleanup in deployment workflows to reclaim space and improve resource management 7c4650f83b

Update deployment workflow to use environment-specific variables and enhance application URL references 1c29fbf958

webmaster merged commit 4f2a435e2a into main 2025-12-20 20:04:57 +00:00

webmaster referenced this issue from a commit 2025-12-20 20:04:58 +00:00

dev (#2)

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

No items

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

webmaster

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: webmaster/merchbay_admin#2