Skip to content

Commit

Permalink
Upgrade Airflow in main to be 2.10.0dev0 (apache#38699)
Browse files Browse the repository at this point in the history
  • Loading branch information
potiuk authored Apr 3, 2024
1 parent c65b083 commit 201e1aa
Show file tree
Hide file tree
Showing 14 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion airflow/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# under the License.
from __future__ import annotations

__version__ = "2.9.0.dev0"
__version__ = "2.10.0.dev0"

import os
import sys
Expand Down
10 changes: 5 additions & 5 deletions docs/docker-stack/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ Every time a new version of Airflow is released, the images are prepared in the
[apache/airflow DockerHub](https://hub.docker.com/r/apache/airflow)
for all the supported Python versions.

You can find the following images there (Assuming Airflow version `2.9.0.dev0`):
You can find the following images there (Assuming Airflow version `2.10.0.dev0`):

* `apache/airflow:latest` - the latest released Airflow image with default Python version (3.8 currently)
* `apache/airflow:latest-pythonX.Y` - the latest released Airflow image with specific Python version
* `apache/airflow:2.9.0.dev0` - the versioned Airflow image with default Python version (3.8 currently)
* `apache/airflow:2.9.0.dev0-pythonX.Y` - the versioned Airflow image with specific Python version
* `apache/airflow:2.10.0.dev0` - the versioned Airflow image with default Python version (3.8 currently)
* `apache/airflow:2.10.0.dev0-pythonX.Y` - the versioned Airflow image with specific Python version

Those are "reference" regular images. They contain the most common set of extras, dependencies and providers that are
often used by the users and they are good to "try-things-out" when you want to just take Airflow for a spin,
Expand All @@ -47,8 +47,8 @@ via [Building the image](https://airflow.apache.org/docs/docker-stack/build.html

* `apache/airflow:slim-latest` - the latest released Airflow image with default Python version (3.8 currently)
* `apache/airflow:slim-latest-pythonX.Y` - the latest released Airflow image with specific Python version
* `apache/airflow:slim-2.9.0.dev0` - the versioned Airflow image with default Python version (3.8 currently)
* `apache/airflow:slim-2.9.0.dev0-pythonX.Y` - the versioned Airflow image with specific Python version
* `apache/airflow:slim-2.10.0.dev0` - the versioned Airflow image with default Python version (3.8 currently)
* `apache/airflow:slim-2.10.0.dev0-pythonX.Y` - the versioned Airflow image with specific Python version

The Apache Airflow image provided as convenience package is optimized for size, and
it provides just a bare minimal set of the extras and dependencies installed and in most cases
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
ENV AIRFLOW__CORE__LOAD_EXAMPLES=True
ENV AIRFLOW__DATABASE__SQL_ALCHEMY_CONN=my_conn_string
# [END Dockerfile]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
USER root
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
RUN pip install --no-cache-dir "apache-airflow==${AIRFLOW_VERSION}" lxml --constraint "${HOME}/constraints.txt"
# [END Dockerfile]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0

# The `uv` tools is Rust packaging tool that is much faster than `pip` and other installer
# Support for uv as installation tool is experimental
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
RUN pip install --no-cache-dir "apache-airflow==${AIRFLOW_VERSION}" lxml
# [END Dockerfile]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
COPY requirements.txt /
RUN pip install --no-cache-dir "apache-airflow==${AIRFLOW_VERSION}" -r /requirements.txt
# [END Dockerfile]
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
RUN pip install "apache-airflow==${AIRFLOW_VERSION}" --no-cache-dir apache-airflow-providers-docker==2.5.1
# [END Dockerfile]
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0

COPY --chown=airflow:root test_dag.py /opt/airflow/dags

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

# This is an example Dockerfile. It is not intended for PRODUCTION use
# [START Dockerfile]
FROM apache/airflow:2.9.0.dev0
FROM apache/airflow:2.10.0.dev0
RUN umask 0002; \
mkdir -p ~/writeable-directory
# [END Dockerfile]
14 changes: 7 additions & 7 deletions docs/docker-stack/entrypoint.rst
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ if you specify extra arguments. For example:

.. code-block:: bash
docker run -it apache/airflow:2.9.0.dev0-python3.8 bash -c "ls -la"
docker run -it apache/airflow:2.10.0.dev0-python3.8 bash -c "ls -la"
total 16
drwxr-xr-x 4 airflow root 4096 Jun 5 18:12 .
drwxr-xr-x 1 root root 4096 Jun 5 18:12 ..
Expand All @@ -144,21 +144,21 @@ you pass extra parameters. For example:

.. code-block:: bash
> docker run -it apache/airflow:2.9.0.dev0-python3.8 python -c "print('test')"
> docker run -it apache/airflow:2.10.0.dev0-python3.8 python -c "print('test')"
test
If first argument equals to "airflow" - the rest of the arguments is treated as an airflow command
to execute. Example:

.. code-block:: bash
docker run -it apache/airflow:2.9.0.dev0-python3.8 airflow webserver
docker run -it apache/airflow:2.10.0.dev0-python3.8 airflow webserver
If there are any other arguments - they are simply passed to the "airflow" command

.. code-block:: bash
> docker run -it apache/airflow:2.9.0.dev0-python3.8 help
> docker run -it apache/airflow:2.10.0.dev0-python3.8 help
usage: airflow [-h] GROUP_OR_COMMAND ...
positional arguments:
Expand Down Expand Up @@ -363,7 +363,7 @@ database and creating an ``admin/admin`` Admin user with the following command:
--env "_AIRFLOW_DB_MIGRATE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD=admin" \
apache/airflow:2.9.0.dev0-python3.8 webserver
apache/airflow:2.10.0.dev0-python3.8 webserver
.. code-block:: bash
Expand All @@ -372,7 +372,7 @@ database and creating an ``admin/admin`` Admin user with the following command:
--env "_AIRFLOW_DB_MIGRATE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD_CMD=echo admin" \
apache/airflow:2.9.0.dev0-python3.8 webserver
apache/airflow:2.10.0.dev0-python3.8 webserver
The commands above perform initialization of the SQLite database, create admin user with admin password
and Admin role. They also forward local port ``8080`` to the webserver port and finally start the webserver.
Expand Down Expand Up @@ -412,6 +412,6 @@ Example:
--env "_AIRFLOW_DB_MIGRATE=true" \
--env "_AIRFLOW_WWW_USER_CREATE=true" \
--env "_AIRFLOW_WWW_USER_PASSWORD_CMD=echo admin" \
apache/airflow:2.9.0.dev0-python3.8 webserver
apache/airflow:2.10.0.dev0-python3.8 webserver
This method is only available starting from Docker image of Airflow 2.1.1 and above.

0 comments on commit 201e1aa

Please sign in to comment.