diff --git a/bitnami/airflow/2/debian-12/Dockerfile b/bitnami/airflow/2/debian-12/Dockerfile index 4449aec0c8e2..86e31d20e0cd 100644 --- a/bitnami/airflow/2/debian-12/Dockerfile +++ b/bitnami/airflow/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-04T20:56:37Z" \ + org.opencontainers.image.created="2024-03-05T23:14:14Z" \ 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-r2" \ + org.opencontainers.image.ref.name="2.8.2-debian-12-r3" \ org.opencontainers.image.title="airflow" \ org.opencontainers.image.vendor="VMware, Inc." \ org.opencontainers.image.version="2.8.2" diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh index 87fca9db6096..82896782331a 100644 --- a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh +++ b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/airflow-env.sh @@ -31,6 +31,7 @@ airflow_env_vars=( AIRFLOW_EMAIL AIRFLOW_EXECUTOR AIRFLOW_RAW_FERNET_KEY + AIRFLOW_FORCE_OVERWRITE_CONF_FILE AIRFLOW_FERNET_KEY AIRFLOW_SECRET_KEY AIRFLOW_WEBSERVER_HOST @@ -108,6 +109,7 @@ export AIRFLOW_EMAIL="${AIRFLOW_EMAIL:-user@example.com}" # Airflow configuration export AIRFLOW_EXECUTOR="${AIRFLOW_EXECUTOR:-SequentialExecutor}" export AIRFLOW_RAW_FERNET_KEY="${AIRFLOW_RAW_FERNET_KEY:-}" +export AIRFLOW_FORCE_OVERWRITE_CONF_FILE="${AIRFLOW_FORCE_OVERWRITE_CONF_FILE:-no}" export AIRFLOW_FERNET_KEY="${AIRFLOW_FERNET_KEY:-}" export AIRFLOW_SECRET_KEY="${AIRFLOW_SECRET_KEY:-}" export AIRFLOW_WEBSERVER_HOST="${AIRFLOW_WEBSERVER_HOST:-127.0.0.1}" diff --git a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh b/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh index b21d4cb26ed7..bcdf77ef557a 100644 --- a/bitnami/airflow/2/debian-12/rootfs/opt/bitnami/scripts/libairflow.sh +++ b/bitnami/airflow/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/README.md b/bitnami/airflow/README.md index edd0f89f18c3..f5e81cfa6e05 100644 --- a/bitnami/airflow/README.md +++ b/bitnami/airflow/README.md @@ -295,35 +295,36 @@ This container supports the installation of additional python modules at start-u #### Customizable environment variables -| Name | Description | Default Value | -|------------------------------------|-------------------------------------------------------------------|----------------------| -| `AIRFLOW_USERNAME` | Airflow username | `user` | -| `AIRFLOW_PASSWORD` | Airflow password | `bitnami` | -| `AIRFLOW_FIRSTNAME` | Airflow firstname | `Firstname` | -| `AIRFLOW_LASTNAME` | Airflow lastname | `Lastname` | -| `AIRFLOW_EMAIL` | Airflow email | `user@example.com` | -| `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` | -| `AIRFLOW_LDAP_ENABLE` | Enable LDAP authentication. | `no` | -| `AIRFLOW_LDAP_USER_REGISTRATION` | User self registration. | `True` | -| `AIRFLOW_LDAP_ROLES_SYNC_AT_LOGIN` | Replace ALL the user roles each login, or only on registration. | `True` | -| `AIRFLOW_LDAP_USE_TLS` | Use LDAP SSL. | `False` | -| `AIRFLOW_LDAP_ALLOW_SELF_SIGNED` | Allow self signed certicates in LDAP ssl. | `True` | +| Name | Description | Default Value | +|-------------------------------------|-------------------------------------------------------------------|----------------------| +| `AIRFLOW_USERNAME` | Airflow username | `user` | +| `AIRFLOW_PASSWORD` | Airflow password | `bitnami` | +| `AIRFLOW_FIRSTNAME` | Airflow firstname | `Firstname` | +| `AIRFLOW_LASTNAME` | Airflow lastname | `Lastname` | +| `AIRFLOW_EMAIL` | Airflow email | `user@example.com` | +| `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` | +| `AIRFLOW_LDAP_ENABLE` | Enable LDAP authentication. | `no` | +| `AIRFLOW_LDAP_USER_REGISTRATION` | User self registration. | `True` | +| `AIRFLOW_LDAP_ROLES_SYNC_AT_LOGIN` | Replace ALL the user roles each login, or only on registration. | `True` | +| `AIRFLOW_LDAP_USE_TLS` | Use LDAP SSL. | `False` | +| `AIRFLOW_LDAP_ALLOW_SELF_SIGNED` | Allow self signed certicates in LDAP ssl. | `True` | #### Read-only environment variables