docker-compose: update bot image tag to use dynamic environment variable for versioning; enhance GitHub Actions workflow to set and use image tag based on commit SHA
This commit is contained in:
parent
7e16c10a9e
commit
f92616ce11
13
.github/workflows/deploy.yml
vendored
13
.github/workflows/deploy.yml
vendored
@ -11,6 +11,8 @@ jobs:
|
|||||||
build-and-push:
|
build-and-push:
|
||||||
name: Build and Push to Docker Hub
|
name: Build and Push to Docker Hub
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
|
outputs:
|
||||||
|
tag: ${{ steps.vars.outputs.tag }}
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code
|
- name: Checkout code
|
||||||
uses: actions/checkout@v3
|
uses: actions/checkout@v3
|
||||||
@ -24,16 +26,21 @@ jobs:
|
|||||||
echo "REDIS_PASSWORD=fake" >> .env
|
echo "REDIS_PASSWORD=fake" >> .env
|
||||||
echo "REDIS_HOST=redis" >> .env
|
echo "REDIS_HOST=redis" >> .env
|
||||||
|
|
||||||
|
- name: Set image tag
|
||||||
|
id: vars
|
||||||
|
run: |
|
||||||
|
echo "tag=${GITHUB_SHA::7}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
|
run: echo "${{ secrets.DOCKERHUB_TOKEN }}" | docker login -u "${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
|
||||||
|
|
||||||
- name: Build bot image
|
- name: Build bot image
|
||||||
run: |
|
run: |
|
||||||
docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/next-downloader-bot:latest -f ./apps/bot/Dockerfile .
|
docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/next-downloader-bot:${{ steps.vars.outputs.tag }} -f ./apps/bot/Dockerfile .
|
||||||
|
|
||||||
- name: Push bot image to Docker Hub
|
- name: Push bot image to Docker Hub
|
||||||
run: |
|
run: |
|
||||||
docker push ${{ secrets.DOCKERHUB_USERNAME }}/next-downloader-bot:latest
|
docker push ${{ secrets.DOCKERHUB_USERNAME }}/next-downloader-bot:${{ steps.vars.outputs.tag }}
|
||||||
|
|
||||||
deploy:
|
deploy:
|
||||||
name: Deploy to VPS
|
name: Deploy to VPS
|
||||||
@ -63,6 +70,8 @@ jobs:
|
|||||||
echo "TELEGRAM_API_HASH=${{ secrets.TELEGRAM_API_HASH }}" >> .env
|
echo "TELEGRAM_API_HASH=${{ secrets.TELEGRAM_API_HASH }}" >> .env
|
||||||
echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env
|
echo "REDIS_PASSWORD=${{ secrets.REDIS_PASSWORD }}" >> .env
|
||||||
echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env
|
echo "REDIS_HOST=${{ secrets.REDIS_HOST }}" >> .env
|
||||||
|
echo "BOT_IMAGE_TAG=${{ needs.build-and-push.outputs.tag }}" >> .env
|
||||||
|
echo "DOCKERHUB_USERNAME=${{ secrets.DOCKERHUB_USERNAME }}" >> .env
|
||||||
|
|
||||||
- name: Copy .env to VPS via SCP
|
- name: Copy .env to VPS via SCP
|
||||||
uses: appleboy/scp-action@master
|
uses: appleboy/scp-action@master
|
||||||
|
|||||||
@ -23,7 +23,7 @@ services:
|
|||||||
start_period: 30s
|
start_period: 30s
|
||||||
|
|
||||||
next-downloader-bot:
|
next-downloader-bot:
|
||||||
image: vchikalkin/next-downloader-bot:latest
|
image: "${DOCKERHUB_USERNAME}/next-downloader-bot:${BOT_IMAGE_TAG}"
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
restart: always
|
restart: always
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user