dev #2

Merged
webmaster merged 34 commits from dev into main 2025-12-20 20:04:57 +00:00
3 changed files with 14 additions and 0 deletions
Showing only changes of commit af0d8cd9ac - Show all commits

View File

@@ -9,6 +9,8 @@ on:
jobs: jobs:
build-and-push: build-and-push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps: steps:
- name: Checkout code - name: Checkout code

View File

@@ -9,9 +9,12 @@ on:
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps: steps:
- name: Checkout code - name: Checkout code
shell: sh
run: | run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo || true git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo || true
cd /workspace/repo cd /workspace/repo
@@ -20,12 +23,14 @@ jobs:
git pull origin $GITHUB_REF_NAME git pull origin $GITHUB_REF_NAME
- name: Build Docker Image - name: Build Docker Image
shell: sh
run: | run: |
cd /workspace/repo cd /workspace/repo
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
- name: Setup SSH and Deploy - name: Setup SSH and Deploy
shell: sh
run: | run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
printf '%s' "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key printf '%s' "$DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
@@ -80,6 +85,7 @@ jobs:
DEV_DB_PASSWORD: ${{ secrets.DEV_DB_PASSWORD }} DEV_DB_PASSWORD: ${{ secrets.DEV_DB_PASSWORD }}
- name: Health Check - name: Health Check
shell: sh
run: | run: |
sleep 10 sleep 10
curl -f https://dev.merchbay.app || exit 1 curl -f https://dev.merchbay.app || exit 1

View File

@@ -10,9 +10,12 @@ on:
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container:
image: catthehacker/ubuntu:act-latest
steps: steps:
- name: Checkout code - name: Checkout code
shell: sh
run: | run: |
git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo || true git clone $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git /workspace/repo || true
cd /workspace/repo cd /workspace/repo
@@ -21,12 +24,14 @@ jobs:
git pull origin $GITHUB_REF_NAME git pull origin $GITHUB_REF_NAME
- name: Build Docker Image - name: Build Docker Image
shell: sh
run: | run: |
cd /workspace/repo cd /workspace/repo
docker build -t merchbay_admin:latest . docker build -t merchbay_admin:latest .
docker save merchbay_admin:latest | gzip > merchbay_admin.tar.gz docker save merchbay_admin:latest | gzip > merchbay_admin.tar.gz
- name: Setup SSH and Deploy - name: Setup SSH and Deploy
shell: sh
run: | run: |
mkdir -p ~/.ssh mkdir -p ~/.ssh
printf '%s' "$PROD_DEPLOY_SSH_KEY" > ~/.ssh/deploy_key printf '%s' "$PROD_DEPLOY_SSH_KEY" > ~/.ssh/deploy_key
@@ -81,6 +86,7 @@ jobs:
PROD_DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }} PROD_DB_PASSWORD: ${{ secrets.PROD_DB_PASSWORD }}
- name: Health Check - name: Health Check
shell: sh
run: | run: |
sleep 10 sleep 10
curl -f https://merchbay.com || exit 1 curl -f https://merchbay.com || exit 1