Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Version images. #131

Closed
wants to merge 1 commit into from
Closed

Version images. #131

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .github/workflows/ci.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: CI Services

on:
pull_request:
branches:
- main
paths-ignore:
- ".github/**"
- ".makefiles/**"

concurrency:
group: ci-${{ github.ref_name }}
cancel-in-progress: true

jobs:
docker-build:
name: Docker build
uses: ./.github/workflows/docker-build.yaml
secrets: inherit
with:
folder: .
image_name: hortusfox-web
push: false
23 changes: 23 additions & 0 deletions .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Docker

on:
push:
branches:
- main
paths-ignore:
- ".github/**"
- ".makefiles/**"

concurrency:
group: ci-${{ github.ref_name }}
cancel-in-progress: true

jobs:
docker-build:
name: Docker build
uses: ./.github/workflows/docker-build.yaml
secrets: inherit
with:
folder: .
image_name: hortusfox-web
push: true
16 changes: 0 additions & 16 deletions .github/workflows/publish-ghcr.yaml
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions docker-entrypoint.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ create_environment_file() {
DB_DATABASE="$DB_DATABASE"
DB_DRIVER=mysql
DB_CHARSET="$DB_CHARSET"

# SMTP Settings
SMTP_FROMNAME="$SMTP_FROMNAME"
SMTP_FROMADDRESS="$SMTP_FROMADDRESS"
Expand Down Expand Up @@ -132,7 +132,7 @@ set_apache_server_name() {

# Function to check DB connection
check_db() {
mysql -u "$DB_USERNAME" -p"$DB_PASSWORD" -h "$DB_HOST" -D "$DB_DATABASE" -N -s -e "SELECT 1;" > /dev/null 2>&1
mysql -u "$DB_USERNAME" -p"$DB_PASSWORD" -h "$DB_HOST" -D "$DB_DATABASE" -N -s -e "SELECT 1;"
}

# Function to wait for the database
Expand Down