dev #2

Merged
webmaster merged 34 commits from dev into main 2025-12-20 20:04:57 +00:00
Showing only changes of commit 73b178fa2c - Show all commits

View File

@@ -28,6 +28,7 @@ jobs:
docker build -t merchbay_admin:dev . docker build -t merchbay_admin:dev .
docker save merchbay_admin:dev | gzip > merchbay_admin_dev.tar.gz docker save merchbay_admin:dev | gzip > merchbay_admin_dev.tar.gz
# 🔍 SAFE SECRET DEBUG (TEMPORARY REMOVE LATER)
- name: Debug secrets (safe) - name: Debug secrets (safe)
shell: sh shell: sh
run: | run: |
@@ -35,32 +36,52 @@ jobs:
if [ -z "${DEPLOY_SSH_KEY}" ]; then if [ -z "${DEPLOY_SSH_KEY}" ]; then
echo "❌ DEPLOY_SSH_KEY is EMPTY or NOT SET" echo "❌ DEPLOY_SSH_KEY is EMPTY or NOT SET"
exit 1
else else
echo "✅ DEPLOY_SSH_KEY is SET" echo "✅ DEPLOY_SSH_KEY is SET"
echo "Length: ${#DEPLOY_SSH_KEY}" echo "Length: ${#DEPLOY_SSH_KEY}"
echo "First line:"
echo "${DEPLOY_SSH_KEY}" | head -n 1 echo "${DEPLOY_SSH_KEY}" | head -n 1
echo "Last line:"
echo "${DEPLOY_SSH_KEY}" | tail -n 1 echo "${DEPLOY_SSH_KEY}" | tail -n 1
fi fi
if [ -z "${DEPLOY_USER}" ]; then [ -z "${DEPLOY_USER}" ] && echo "❌ DEPLOY_USER EMPTY" && exit 1
echo "❌ DEPLOY_USER is EMPTY" [ -z "${DEPLOY_HOST}" ] && echo "❌ DEPLOY_HOST EMPTY" && exit 1
else
echo "✅ DEPLOY_USER = ${DEPLOY_USER}"
fi
if [ -z "${DEPLOY_HOST}" ]; then echo "DEPLOY_USER=${DEPLOY_USER}"
echo "DEPLOY_HOST is EMPTY" echo "DEPLOY_HOST=${DEPLOY_HOST}"
else
echo "✅ DEPLOY_HOST = ${DEPLOY_HOST}"
fi
env: env:
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }} DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_USER: ${{ secrets.DEPLOY_USER }} DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }} DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
# 🔐 REQUIRED STEP (THIS WAS MISSING)
- name: Setup SSH
shell: sh
run: |
mkdir -p ~/.ssh
chmod 700 ~/.ssh
echo "${DEPLOY_SSH_KEY}" > ~/.ssh/id_ed25519
chmod 600 ~/.ssh/id_ed25519
ssh-keyscan -H ${DEPLOY_HOST} >> ~/.ssh/known_hosts
echo "SSH files:"
ls -l ~/.ssh
env:
DEPLOY_SSH_KEY: ${{ secrets.DEPLOY_SSH_KEY }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
# 🧪 OPTIONAL BUT HIGHLY RECOMMENDED (run once)
- name: SSH sanity check
shell: sh
run: |
ssh -i ~/.ssh/id_ed25519 ${DEPLOY_USER}@${DEPLOY_HOST} "whoami"
env:
DEPLOY_USER: ${{ secrets.DEPLOY_USER }}
DEPLOY_HOST: ${{ secrets.DEPLOY_HOST }}
# 🚀 DEPLOY
- name: Deploy to Server - name: Deploy to Server
shell: sh shell: sh
run: | run: |