fix compose, remove lower_actor
This commit is contained in:
@@ -13,9 +13,6 @@ jobs:
|
|||||||
- name: Get release version
|
- name: Get release version
|
||||||
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
|
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
|
||||||
|
|
||||||
- name: Downcase username
|
|
||||||
run: echo "lower_actor=${GITHUB_ACTOR,,}" >> $GITHUB_ENV
|
|
||||||
|
|
||||||
- name: Determine tag type (prod vs main)
|
- name: Determine tag type (prod vs main)
|
||||||
id: tag_type
|
id: tag_type
|
||||||
run: |
|
run: |
|
||||||
@@ -51,8 +48,8 @@ jobs:
|
|||||||
context: ./
|
context: ./
|
||||||
push: true
|
push: true
|
||||||
tags: |
|
tags: |
|
||||||
ghcr.io/${{ env.lower_actor }}/aperisolve:${{ env.RELEASE_VERSION }}
|
ghcr.io/zeecka/aperisolve:${{ env.RELEASE_VERSION }}
|
||||||
ghcr.io/${{ env.lower_actor }}/aperisolve:prod
|
ghcr.io/zeecka/aperisolve:prod
|
||||||
|
|
||||||
# Build and push for MAIN tags (X.X.X)
|
# Build and push for MAIN tags (X.X.X)
|
||||||
- name: Build and push Docker images (main)
|
- name: Build and push Docker images (main)
|
||||||
|
|||||||
+12
-8
@@ -5,12 +5,14 @@ services:
|
|||||||
container_name: aperisolve-web
|
container_name: aperisolve-web
|
||||||
restart: always
|
restart: always
|
||||||
ports:
|
ports:
|
||||||
- "80:5000"
|
- "5000:5000"
|
||||||
volumes:
|
volumes:
|
||||||
- apresults:/aperisolve/results
|
- apresults:/app/aperisolve/results
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
initdb:
|
||||||
|
condition: service_completed_successfully
|
||||||
redis:
|
redis:
|
||||||
condition: service_started
|
condition: service_started
|
||||||
worker:
|
worker:
|
||||||
@@ -31,14 +33,16 @@ services:
|
|||||||
restart: always
|
restart: always
|
||||||
command: rq worker default --url redis://redis:6379/0
|
command: rq worker default --url redis://redis:6379/0
|
||||||
volumes:
|
volumes:
|
||||||
- apresults:/aperisolve/results
|
- apresults:/app/aperisolve/results
|
||||||
depends_on:
|
depends_on:
|
||||||
- redis
|
postgres:
|
||||||
- postgres
|
condition: service_healthy
|
||||||
|
initdb:
|
||||||
|
condition: service_completed_successfully
|
||||||
|
redis:
|
||||||
|
condition: service_started
|
||||||
env_file:
|
env_file:
|
||||||
- .env
|
- .env
|
||||||
environment:
|
|
||||||
- CLEAR_AT_RESTART=0 # Always false for worker to prevent double clearing
|
|
||||||
|
|
||||||
initdb:
|
initdb:
|
||||||
image: ghcr.io/zeecka/aperisolve:latest
|
image: ghcr.io/zeecka/aperisolve:latest
|
||||||
@@ -46,7 +50,7 @@ services:
|
|||||||
container_name: aperisolve-initdb
|
container_name: aperisolve-initdb
|
||||||
command: python -m aperisolve.utils.init_db
|
command: python -m aperisolve.utils.init_db
|
||||||
volumes:
|
volumes:
|
||||||
- apresults:/aperisolve/results
|
- apresults:/app/aperisolve/results
|
||||||
depends_on:
|
depends_on:
|
||||||
postgres:
|
postgres:
|
||||||
condition: service_healthy
|
condition: service_healthy
|
||||||
|
|||||||
Reference in New Issue
Block a user