Skip to content

Commit

Permalink
Version images.
Browse files Browse the repository at this point in the history
  • Loading branch information
rmt-javier committed Mar 3, 2024
1 parent 6d2d7d7 commit dbbaa03
Show file tree
Hide file tree
Showing 4 changed files with 48 additions and 18 deletions.
23 changes: 23 additions & 0 deletions .github/workflows/ci.yaml
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
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

This file was deleted.

4 changes: 2 additions & 2 deletions docker-entrypoint.sh
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

0 comments on commit dbbaa03

Please sign in to comment.