diff --git a/bitnami/airflow-scheduler/2/debian-12/Dockerfile b/bitnami/airflow-scheduler/2/debian-12/Dockerfile index 8c22edfe9525..155b00114590 100644 --- a/bitnami/airflow-scheduler/2/debian-12/Dockerfile +++ b/bitnami/airflow-scheduler/2/debian-12/Dockerfile @@ -7,10 +7,10 @@ ARG TARGETARCH LABEL com.vmware.cp.artifact.flavor="sha256:c50c90cfd9d12b445b011e6ad529f1ad3daea45c26d20b00732fae3cd71f6a83" \ org.opencontainers.image.base.name="docker.io/bitnami/minideb:bookworm" \ - org.opencontainers.image.created="2024-03-01T15:58:24Z" \ + org.opencontainers.image.created="2024-03-05T21:54:40Z" \ org.opencontainers.image.description="Application packaged by VMware, Inc" \ org.opencontainers.image.licenses="Apache-2.0" \ - org.opencontainers.image.ref.name="2.8.2-debian-12-r1" \ + org.opencontainers.image.ref.name="2.8.2-debian-12-r2" \ org.opencontainers.image.title="airflow-scheduler" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.8.2" diff --git a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/airflow-scheduler-env.sh b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/airflow-scheduler-env.sh index 54b8bdd378fa..ff2869da278d 100644 --- a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/airflow-scheduler-env.sh +++ b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/airflow-scheduler-env.sh @@ -25,6 +25,7 @@ export BITNAMI_DEBUG="${BITNAMI_DEBUG:-false}" # variable will be overridden with the value specified in that file airflow_scheduler_env_vars=( AIRFLOW_EXECUTOR + AIRFLOW_FORCE_OVERWRITE_CONF_FILE AIRFLOW_RAW_FERNET_KEY AIRFLOW_FERNET_KEY AIRFLOW_SECRET_KEY @@ -77,6 +78,7 @@ export AIRFLOW_DAEMON_GROUP="airflow" # Airflow configuration export AIRFLOW_EXECUTOR="${AIRFLOW_EXECUTOR:-SequentialExecutor}" +export AIRFLOW_FORCE_OVERWRITE_CONF_FILE="${AIRFLOW_FORCE_OVERWRITE_CONF_FILE:-no}" export AIRFLOW_RAW_FERNET_KEY="${AIRFLOW_RAW_FERNET_KEY:-}" export AIRFLOW_FERNET_KEY="${AIRFLOW_FERNET_KEY:-}" export AIRFLOW_SECRET_KEY="${AIRFLOW_SECRET_KEY:-}" diff --git a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh index b21d4cb26ed7..bcdf77ef557a 100644 --- a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh @@ -115,7 +115,7 @@ airflow_initialize() { done # The configuration file is not persisted. If it is not provided, generate it based on env vars - if [[ ! -f "$AIRFLOW_CONF_FILE" ]]; then + if [[ ! -f "$AIRFLOW_CONF_FILE" ]] || is_boolean_yes "$AIRFLOW_FORCE_OVERWRITE_CONF_FILE"; then info "No injected configuration file found. Creating default config file" airflow_generate_config else diff --git a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflowscheduler.sh b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflowscheduler.sh index b6a05f365536..cfc76cccd4a3 100644 --- a/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflowscheduler.sh +++ b/bitnami/airflow-scheduler/2/debian-12/rootfs/opt/bitnami/scripts/libairflowscheduler.sh @@ -67,7 +67,7 @@ airflow_scheduler_initialize() { done # The configuration file is not persisted. If it is not provided, generate it based on env vars - if [[ ! -f "$AIRFLOW_CONF_FILE" ]]; then + if [[ ! -f "$AIRFLOW_CONF_FILE" ]] || is_boolean_yes "$AIRFLOW_FORCE_OVERWRITE_CONF_FILE"; then info "No injected configuration file found. Creating default config file" airflow_scheduler_generate_config else diff --git a/bitnami/airflow-scheduler/README.md b/bitnami/airflow-scheduler/README.md index 26f8afd3a62d..4e75db4de7a2 100644 --- a/bitnami/airflow-scheduler/README.md +++ b/bitnami/airflow-scheduler/README.md @@ -287,25 +287,26 @@ This container supports the installation of additional python modules at start-u #### Customizable environment variables -| Name | Description | Default Value | -|---------------------------------|-------------------------------------------------------------------|----------------------| -| `AIRFLOW_EXECUTOR` | Airflow executor. | `SequentialExecutor` | -| `AIRFLOW_EXECUTOR` | Airflow executor. | `CeleryExecutor` | -| `AIRFLOW_WEBSERVER_HOST` | Airflow webserver host | `127.0.0.1` | -| `AIRFLOW_WEBSERVER_PORT_NUMBER` | Airflow webserver port. | `8080` | -| `AIRFLOW_LOAD_EXAMPLES` | To load example tasks into the application. | `yes` | -| `AIRFLOW_HOSTNAME_CALLABLE` | Method to obtain the hostname. | `socket.gethostname` | -| `AIRFLOW_DATABASE_HOST` | Hostname for PostgreSQL server. | `postgresql` | -| `AIRFLOW_DATABASE_HOST` | Hostname for PostgreSQL server. | `127.0.0.1` | -| `AIRFLOW_DATABASE_PORT_NUMBER` | Port used by PostgreSQL server. | `5432` | -| `AIRFLOW_DATABASE_NAME` | Database name that Airflow will use to connect with the database. | `bitnami_airflow` | -| `AIRFLOW_DATABASE_USERNAME` | Database user that Airflow will use to connect with the database. | `bn_airflow` | -| `AIRFLOW_DATABASE_USE_SSL` | Set to yes if the database is using SSL. | `no` | -| `AIRFLOW_REDIS_USE_SSL` | Set to yes if Redis(R) uses SSL. | `no` | -| `REDIS_HOST` | Hostname for Redis(R) server. | `redis` | -| `REDIS_HOST` | Hostname for Redis(R) server. | `127.0.0.1` | -| `REDIS_PORT_NUMBER` | Port used by Redis(R) server. | `6379` | -| `REDIS_DATABASE` | Name of the Redis(R) database. | `1` | +| Name | Description | Default Value | +|-------------------------------------|-------------------------------------------------------------------|----------------------| +| `AIRFLOW_EXECUTOR` | Airflow executor. | `SequentialExecutor` | +| `AIRFLOW_EXECUTOR` | Airflow executor. | `CeleryExecutor` | +| `AIRFLOW_FORCE_OVERWRITE_CONF_FILE` | Force the airflow.cfg config file generation. | `no` | +| `AIRFLOW_WEBSERVER_HOST` | Airflow webserver host | `127.0.0.1` | +| `AIRFLOW_WEBSERVER_PORT_NUMBER` | Airflow webserver port. | `8080` | +| `AIRFLOW_LOAD_EXAMPLES` | To load example tasks into the application. | `yes` | +| `AIRFLOW_HOSTNAME_CALLABLE` | Method to obtain the hostname. | `socket.gethostname` | +| `AIRFLOW_DATABASE_HOST` | Hostname for PostgreSQL server. | `postgresql` | +| `AIRFLOW_DATABASE_HOST` | Hostname for PostgreSQL server. | `127.0.0.1` | +| `AIRFLOW_DATABASE_PORT_NUMBER` | Port used by PostgreSQL server. | `5432` | +| `AIRFLOW_DATABASE_NAME` | Database name that Airflow will use to connect with the database. | `bitnami_airflow` | +| `AIRFLOW_DATABASE_USERNAME` | Database user that Airflow will use to connect with the database. | `bn_airflow` | +| `AIRFLOW_DATABASE_USE_SSL` | Set to yes if the database is using SSL. | `no` | +| `AIRFLOW_REDIS_USE_SSL` | Set to yes if Redis(R) uses SSL. | `no` | +| `REDIS_HOST` | Hostname for Redis(R) server. | `redis` | +| `REDIS_HOST` | Hostname for Redis(R) server. | `127.0.0.1` | +| `REDIS_PORT_NUMBER` | Port used by Redis(R) server. | `6379` | +| `REDIS_DATABASE` | Name of the Redis(R) database. | `1` | #### Read-only environment variables