Using env directly

Author: escopecz

.github/workflows/deploy.yml

@@ -116,17 +116,18 @@ jobs:
           exit 1
         fi
 
-    - name: Prepare setup-dc.sh script
+    - name: Prepare environment configuration
       run: |
-        # Replace placeholders in setup-dc.sh
-        sed -i "s/{{IP_ADDRESS}}/${{ env.ip }}/g" setup-dc.sh
-        sed -i "s/{{PORT}}/${{ env.MAUTIC_PORT }}/g" setup-dc.sh
-        sed -i "s/{{EMAIL_ADDRESS}}/${{ env.EMAIL_ADDRESS }}/g" setup-dc.sh
-        sed -i "s/{{MAUTIC_PASSWORD}}/${{ secrets.MAUTIC_PASSWORD }}/g" setup-dc.sh
-        if [ ! -z "${{ env.DOMAIN }}" ]; then
-          sed -i "s/{{DOMAIN_NAME}}/${{ env.DOMAIN }}/g" setup-dc.sh
+        # Create a deployment .env file with all required variables
+        cp .env deploy.env
+        echo "EMAIL_ADDRESS=${{ vars.EMAIL_ADDRESS }}" >> deploy.env
+        echo "MAUTIC_PASSWORD=${{ secrets.MAUTIC_PASSWORD }}" >> deploy.env
+        echo "IP_ADDRESS=${{ env.ip }}" >> deploy.env
+        echo "PORT=${{ env.MAUTIC_PORT }}" >> deploy.env
+        if [ ! -z "${{ vars.DOMAIN }}" ]; then
+          echo "DOMAIN_NAME=${{ vars.DOMAIN }}" >> deploy.env
         fi
-        cat setup-dc.sh # debug
+        cat deploy.env # debug
       env:
         EMAIL_ADDRESS: ${{ vars.EMAIL_ADDRESS }}
         DOMAIN: ${{ vars.DOMAIN }}

setup-dc.sh

@@ -1,4 +1,13 @@
 cd /var/www
+
+# Load environment variables from deploy.env (created by GitHub Actions)
+if [ -f "/var/www/deploy.env" ]; then
+    source /var/www/deploy.env
+    echo "## Environment variables loaded from deploy.env"
+else
+    echo "## Warning: deploy.env not found, using defaults"
+fi
+
 docker compose build
 docker compose up -d db --wait && docker compose up -d mautic_web --wait
 
@@ -32,15 +41,10 @@ else
         echo "Container $MAUTIC_WORKER_CONTAINER does not exist or is not running."
     fi
     echo "## Installing Mautic..."
-    docker compose exec -T -u www-data -w /var/www/html mautic_web php ./bin/console mautic:install --force --admin_email {{EMAIL_ADDRESS}} --admin_password {{MAUTIC_PASSWORD}} http://{{IP_ADDRESS}}:{{PORT}}
+    docker compose exec -T -u www-data -w /var/www/html mautic_web php ./bin/console mautic:install --force --admin_email "${EMAIL_ADDRESS}" --admin_password "${MAUTIC_PASSWORD}" "http://${IP_ADDRESS}:${PORT}"
 
     echo "## Installing custom themes and plugins..."
 
-    # Load environment variables
-    if [ -f "/var/www/.env" ]; then
-        source /var/www/.env
-    fi
-    
     # Install themes
     if [ ! -z "$MAUTIC_THEMES" ]; then
         echo "### Processing themes..."
@@ -77,10 +81,11 @@ fi
 echo "## Starting all the containers"
 docker compose up -d
 
-DOMAIN="{{DOMAIN_NAME}}"
+# Use DOMAIN_NAME from environment variables
+DOMAIN="$DOMAIN_NAME"
 
-if [[ "$DOMAIN" == *"DOMAIN_NAME"* ]]; then
-    echo "The DOMAIN variable is not set yet."
+if [ -z "$DOMAIN" ]; then
+    echo "The DOMAIN_NAME variable is not set yet."
     exit 0
 fi
 
@@ -125,7 +130,7 @@ fi
 echo "## Configuring Let's Encrypt for $DOMAIN..."
 
 # Use Certbot with the Nginx plugin to obtain and install a certificate
-certbot --nginx -d $DOMAIN --non-interactive --agree-tos -m {{EMAIL_ADDRESS}}
+certbot --nginx -d $DOMAIN --non-interactive --agree-tos -m "$EMAIL_ADDRESS"
 
 # Nginx will be reloaded automatically by Certbot after obtaining the certificate
 echo "## Let's Encrypt configured for $DOMAIN"