fixed docker

Author: Dpbm

Makefile

@@ -1,3 +1,5 @@
+SHELL := /bin/bash
+
 clean-all: clean-dataset clean-pred clean-ghz clean-model clean-checkpoints clean-history
 
 clean-dataset:
@@ -22,4 +24,7 @@ pack:
 	zip -r dataset-images.zip dataset/
 
 lock: 
-	conda-lock -f environment.yml
+	conda-lock -f environment.yml
+
+airflow-up:
+	source airflow-setup-test.sh && docker compose down && docker compose build && docker compose up -d

airflow-entrypoint.sh

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+until pg_isready -h db; do
+	echo "Not ready yet..."
+	sleep 2
+done
+
+echo "Migrating...."
+airflow db migrate
+
+# USER, PASSWORD and EMAIl come from env variables
+echo "Creating Airflow user ${USER}..."
+airflow users create \
+    --username $USER \
+    --firstname user \
+    --lastname user \
+    --role Admin \
+    --email ${EMAIL} \
+    --password ${PASSWORD}
+
+echo "Running scheduler...."
+airflow scheduler &
+
+exec airflow "$@"

airflow.Dockerfile

@@ -1,32 +1,27 @@
 FROM python:3.12.10-slim-bullseye AS setup
-
+WORKDIR /
 COPY requirements.txt .
 RUN python -m venv /proj-venv
-
 ENV PIPENV="/proj-venv/bin/pip"
-
 RUN ${PIPENV} install -r requirements.txt
 
-FROM apache/airflow:slim-2.11.0-python3.12 AS serve
 
+
+FROM busybox:1.37.0 AS entry
+WORKDIR /
+COPY airflow-entrypoint.sh entrypoint.sh
+RUN chmod +x entrypoint.sh
+
+
+FROM apache/airflow:slim-2.11.0-python3.12 AS serve
 COPY --from=setup /proj-venv/lib/python3.12/site-packages/ /home/airflow/.local/lib/python3.12/site-packages
 
 WORKDIR /home/airflow/project
 COPY . .
 
-ARG USER=default
-ARG PASSWORD=default
-ARG [email protected]
-
-RUN airflow db migrate
-RUN airflow users create --username $USER \
-    --firstname user \
-    --lastname user \
-    --role Admin \
-    --email ${EMAIL} \
-    --password ${PASSWORD}
-
-RUN airflow scheduler &
+WORKDIR /
+COPY --from=entry /entrypoint.sh .
 
 EXPOSE 8080
-ENTRYPOINT [ "airflow", "webserver", "--port", "8080" ]
+ENTRYPOINT [ "/entrypoint.sh" ]
+CMD [ "webserver", "--port", "8080" ]

airflow.dockerignore renamed to airflow.Dockerfile.dockerignore

@@ -1,8 +1,9 @@
 *
-!dags/
 !ai/
 !export/
 !generate/
 !utils/
+!args/
 !Makefile
 !requirements.txt
+!airflow-entrypoint.sh

compose.yml

@@ -24,14 +24,13 @@ services:
     build:
       context: .
       dockerfile: airflow.Dockerfile
-      args:
-        - USER=${AIRFLOW_USERNAME}
-        - PASSWORD=${AIRFLOW_PASSWORD}
-        - EMAIL=${AIRFLOW_EMAIL}
     volumes:
       - ./data:/home/airflow/data
       - ./dags:/opt/airflow/dags
     environment:
+      - USER=${AIRFLOW_USERNAME}
+      - PASSWORD=${AIRFLOW_PASSWORD}
+      - EMAIL=${AIRFLOW_EMAIL}
       - PYTHONPATH=/home/airflow/project
       - TARGET_FOLDER=/home/airflow/data
       - TZ=America/Sao_Paulo

database.Dockerfile

@@ -1,5 +1,5 @@
 FROM postgres:17.2-alpine3.21
 
-COPY entrypoint.sh /docker-entrypoint-initdb.d/
+COPY db-entrypoint.sh /docker-entrypoint-initdb.d/entrypoint.sh
 
 RUN chmod +x /docker-entrypoint-initdb.d/entrypoint.sh

database.Dockerfile.dockerignore

@@ -1,2 +1,2 @@
 *
-!entrypoint.sh
+!db-entrypoint.sh

entrypoint.sh renamed to db-entrypoint.sh

@@ -1,3 +1,5 @@
+#!/bin/bash
+
 echo "Waiting for PostgreSQL to start..."
 until pg_isready -U $POSTGRES_USER; do
 	echo "Not ready yet..."

generate/dataset.py

@@ -25,7 +25,7 @@
 from utils.datatypes import FilePath, df_schema, Dimensions
 from utils.image import transform_image
 from utils.colors import Colors
-from utils.random_circuit import get_random_circuit
+from generate.random_circuit import get_random_circuit
 from utils.helpers import get_measurements
 
 Schema = Dict[str, Any]

generate/ghz.py

@@ -4,9 +4,9 @@
 from PIL import Image
 import torch
 
-from image import transform_image
+from utils.image import transform_image
 from args.parser import parse_args
-from constants import ghz_image_file, ghz_file
+from utils.constants import ghz_image_file, ghz_file
 from utils.datatypes import FilePath, Dimensions