fix conflicts

This commit is contained in:
Zeecka
2026-01-04 18:26:39 +01:00
parent e86a16b8bf
commit caa5289ffd
2 changed files with 18 additions and 16 deletions
-10
View File
@@ -1,10 +0,0 @@
MAX_CONTENT_LENGTH=1048576
MAX_PENDING_TIME=600
MAX_STORE_TIME=259200
FLASK_DEBUG=0
FLASK_ENV=production
DB_URI=postgresql://aperiuser:iacyANdLeUREonIuMPorpHySTaIsHEAn@postgres:5432/aperisolve
RQ_DASHBOARD_REDIS_URL=redis://redis:6379/0
POSTGRES_DB=aperisolve
POSTGRES_USER=aperiuser
POSTGRES_PASSWORD=iacyANdLeUREonIuMPorpHySTaIsHEAn
+14 -2
View File
@@ -10,6 +10,8 @@ jobs:
docker-releases:
runs-on: ubuntu-latest
if: startsWith(github.ref, 'refs/tags/') && (github.ref_name == 'main' || github.ref_name == 'prod')
steps:
- name: Get release version
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
@@ -33,11 +35,21 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Determine latest tag
run: |
if [[ "${GITHUB_REF_NAME}" == "main" ]]; then
echo "LATEST_TAG=latest" >> $GITHUB_ENV
elif [[ "${GITHUB_REF_NAME}" == "prod" ]]; then
echo "LATEST_TAG=latest-prod" >> $GITHUB_ENV
else
echo "LATEST_TAG=" >> $GITHUB_ENV
fi
- name: Build and push Docker images
uses: docker/build-push-action@v6.9.0
with:
context: ./
push: true
tags: |
ghcr.io/${{ env.lower_actor }}/aperisolve:prod
ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }}
ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.LATEST_TAG }}