Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:
branches: [ main ]

env:
api:
ENV: dev
AIRFLOW_PROJ_DIR: /home/runner/work/AlertFlow/AlertFlow/alertflow
AIRFLOW_HOME: /opt/airflow
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:

- name: Wait Containers
run: |
make containers-wait-all
make wait-all

# - name: Setup tmate session
# if: "${{ failure() }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: actions/setup-node@v3
with:
node-version: 20.11.0
node-version: 24.15.0

- name: Test release
if: ${{ github.event_name != 'workflow_dispatch' }}
Expand Down
26 changes: 16 additions & 10 deletions .sugar.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ groups:
- docker/compose-dev.yaml
env-file: .env
services:
default: scheduler,triggerer,webserver,worker
default: redis,postgres,airflow-scheduler,airflow-triggerer,airflow-apiserver,airflow-worker,airflow-dag-processor
available:
- name: scheduler
- name: triggerer
- name: webserver
- name: worker
- name: redis
- name: postgres
- name: airflow-scheduler
- name: airflow-triggerer
- name: airflow-apiserver
- name: airflow-worker
- name: airflow-dag-processor

prod:
project-name: alertflow
Expand All @@ -26,9 +29,12 @@ groups:
- docker/compose-prod.yaml
env-file: .env
services:
default: scheduler,triggerer,webserver,worker
default: redis,postgres,airflow-scheduler,airflow-triggerer,airflow-apiserver,airflow-worker,airflow-dag-processor
available:
- name: scheduler
- name: triggerer
- name: webserver
- name: worker
- name: redis
- name: postgres
- name: airflow-scheduler
- name: airflow-triggerer
- name: airflow-apiserver
- name: airflow-worker
- name: airflow-dag-processor
43 changes: 19 additions & 24 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,6 @@ CMD:=
ARGS:=
TIMEOUT:=90

# https://github.com/containers/podman-compose/issues/491#issuecomment-1289944841
CONTAINER_APP=docker compose \
--env-file=.env \
--file docker/compose.yaml

include .env

# -- Project --
Expand All @@ -22,35 +17,35 @@ linter:
pre-commit run --all-files --verbose

# -- Docker --
containers-build:
build:
set -e
$(CONTAINER_APP) build ${SERVICES}
sugar build ${SERVICES}

containers-start:
start:
set -ex
$(CONTAINER_APP) up --remove-orphans -d ${SERVICES}
sugar up --remove-orphans -d ${SERVICES}

containers-stop:
stop:
set -ex
$(CONTAINER_APP) stop ${ARGS} ${SERVICES}
sugar stop ${ARGS} ${SERVICES}

containers-rm:
rm:
set -ex
$(CONTAINER_APP) rm ${ARGS} ${SERVICES}
sugar rm ${ARGS} ${SERVICES}

containers-restart: containers-stop containers-start
restart: containers-stop containers-start

containers-down:
$(CONTAINER_APP) down ${ARGS}
down:
sugar down ${ARGS}

containers-logs:
$(CONTAINER_APP) logs ${ARGS} ${SERVICES}
logs:
sugar logs ${ARGS} ${SERVICES}

containers-wait:
wait:
timeout ${TIMEOUT} docker/scripts/healthcheck.sh ${SERVICE}

containers-wait-all:
$(MAKE) containers-wait SERVICE="scheduler"
$(MAKE) containers-wait SERVICE="triggerer"
$(MAKE) containers-wait SERVICE="webserver"
$(MAKE) containers-wait SERVICE="worker"
wait-all:
$(MAKE) wait SERVICE="scheduler"
$(MAKE) wait SERVICE="triggerer"
$(MAKE) wait SERVICE="webserver"
$(MAKE) wait SERVICE="worker"
Loading
Loading