Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 1.10.7-19.dev, 1.10.10-9.dev, 1.10.12-5.dev and 1.10.14-4.dev #285

Merged
merged 1 commit into from
Jul 23, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
423 changes: 388 additions & 35 deletions .circleci/config.yml

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions .circleci/generate_circleci_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
from jinja2 import Environment, FileSystemLoader

IMAGE_MAP = collections.OrderedDict([
("1.10.7-18", ["alpine3.10", "buster"]),
("1.10.10-8", ["alpine3.10", "buster"]),
("1.10.12-4", ["alpine3.10", "buster"]),
("1.10.14-3", ["buster"]),
("1.10.7-19.dev", ["alpine3.10", "buster"]),
("1.10.10-9.dev", ["alpine3.10", "buster"]),
("1.10.12-5.dev", ["alpine3.10", "buster"]),
("1.10.14-4.dev", ["buster"]),
("1.10.15-3", ["buster"]),
("2.0.0-8", ["buster"]),
("2.0.2-4", ["buster"]),
Expand Down
11 changes: 11 additions & 0 deletions 1.10.10/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
# Changelog

Astronomer Certified 1.10.10-9, TBC
--------------------------------------------

### Bug Fixes

- Exclude ``yarn.lock`` from built Python wheel file (#16577) ([commit](https://github.com/astronomer/airflow/commit/06804608f))
- Only allow webserver to request from the worker log server (#16754) ([commit](https://github.com/astronomer/airflow/commit/1df632588))
- Dockerfile: Add constraint for installed Airflow version (#274) ([commit](https://github.com/astronomer/ap-airflow/commit/60174ec))
- Dockerfile: Upgrade Fab Security Manager to 1.6.0 (#272) ([commit](https://github.com/astronomer/ap-airflow/commit/417fd59))
- Dockerfile: Update / Override PIP version in Env Vars (#263) ([commit](https://github.com/astronomer/ap-airflow/commit/ab60218))

Astronomer Certified 1.10.10-8, 2021-04-27
--------------------------------------------

Expand Down
2 changes: 1 addition & 1 deletion 1.10.10/alpine3.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM alpine:3.10
LABEL maintainer="Astronomer <humans@astronomer.io>"

ARG ORG="astronomer"
ARG VERSION="1.10.10-8"
ARG VERSION="1.10.10-9.*"
ARG SUBMODULES="all, statsd, elasticsearch"
ARG AIRFLOW_MODULE="astronomer_certified[${SUBMODULES}]==$VERSION"
ARG REPO_BRANCH=master
Expand Down
4 changes: 2 additions & 2 deletions 1.10.10/buster/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG VERSION="1.10.10-8"
ARG VERSION="1.10.10-9.*"
ARG SUBMODULES="async,azure_blob_storage,azure_cosmos,azure_container_instances,celery,crypto,elasticsearch,gcp,kubernetes,mysql,postgres,s3,emr,redis,slack,ssh,statsd,virtualenv"
ARG AIRFLOW_MODULE="astronomer_certified[${SUBMODULES}]==$VERSION"
ARG AIRFLOW_VERSION="1.10.10"
Expand Down Expand Up @@ -144,7 +144,7 @@ RUN apt-get update \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ARG VERSION="1.10.10-8"
ARG VERSION="1.10.10-9.*"
ARG AIRFLOW_VERSION="1.10.10"
LABEL io.astronomer.docker.airflow.version="${AIRFLOW_VERSION}"
LABEL io.astronomer.docker.ac.version="${VERSION}"
Expand Down
16 changes: 15 additions & 1 deletion 1.10.12/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
# Changelog

Astronomer Certified 1.10.12-5, TBC
-----------------------------------------------

### Bugfixes

- Only allow webserver to request from the worker log server (#16754) ([commit](https://github.com/astronomer/airflow/commit/0ec3decda))
- Exclude ``yarn.lock`` from built Python wheel file (#16577) ([commit](https://github.com/astronomer/airflow/commit/492573cd7))
- [backport] Fix bug with `executor_config` and Volumes ([commit](https://github.com/astronomer/airflow/commit/ae9a5ed41))
- Dockerfile: Add constraint for installed Airflow version (#274) ([commit](https://github.com/astronomer/ap-airflow/commit/60174ec))
- Dockerfile: Update / Override PIP version in Env Vars (#263) ([commit](https://github.com/astronomer/ap-airflow/commit/ab60218))
- Dockerfile: Bump Epoch to fix CVEs (#239) ([commit](https://github.com/astronomer/ap-airflow/commit/6522368))
- Dockerfile: Add missing '--no-cache-dir' in 1.10.12 alpine image (#230) ([commit](https://github.com/astronomer/ap-airflow/commit/6cc5015))
- Dockerfile: Upgrade Fab Security Manager to 1.6.0

Astronomer Certified 1.10.12-4, 2021-03-18
-----------------------------------------------

## Bugfixes
### Bugfixes

- Fix `sync-perm` to work correctly when `update_fab_perms = False` (apache#14847) ([commit](https://github.com/astronomer/airflow/commit/ee476eba705116cd4c2b01ede3645c13b6a226e6))
- Webserver: Sanitize string passed to origin param (apache#14738) ([commit](https://github.com/astronomer/airflow/commit/469faa82f5a449ea4d2c1317942b5ce5b2ae656f))
Expand Down
10 changes: 8 additions & 2 deletions 1.10.12/alpine3.10/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FROM alpine:3.10
LABEL maintainer="Astronomer <humans@astronomer.io>"

ARG ORG="astronomer"
ARG VERSION="1.10.12-4"
ARG VERSION="1.10.12-5.*"
ARG SUBMODULES="all, statsd, elasticsearch"
ARG AIRFLOW_MODULE="astronomer_certified[${SUBMODULES}]==$VERSION"
ARG REPO_BRANCH=master
Expand Down Expand Up @@ -48,6 +48,12 @@ COPY include/humans@astronomer.io.rsa.pub /etc/apk/keys
COPY include/pip.conf /etc/pip.conf
COPY include/pip-constraints.txt /usr/local/share/astronomer-pip-constraints.txt

# This constraints will be only used during docker-build
# and won't be included in the final image
# It is useful to install airflow-providers that work but still allow users to
# install providers of their choice (as opposed to entries in astronomer-pip-constraints.txt)
COPY build-time-pip-constraints.txt /tmp/build-time-pip-constraints.txt

# Install packages
RUN echo https://github.com/astronomer/ap-airflow/raw/${REPO_BRANCH}/alpine-packages/3.10/repo >> /etc/apk/repositories \
&& apk update \
Expand Down Expand Up @@ -93,7 +99,7 @@ RUN echo https://github.com/astronomer/ap-airflow/raw/${REPO_BRANCH}/alpine-pack
&& update-ca-certificates \
&& cp /usr/share/zoneinfo/UTC /etc/localtime \
&& pip3 install --no-cache-dir --upgrade snowflake-connector-python==1.9.1 \
&& pip3 install --no-cache-dir "${AIRFLOW_MODULE}" --constraint "https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-3.7.txt" \
&& pip3 install --no-cache-dir "${AIRFLOW_MODULE}" --constraint /tmp/build-time-pip-constraints.txt \
&& pip3 install --no-cache-dir "https://github.com/astronomer/astronomer-airflow-scripts/releases/download/v0.0.5/astronomer_airflow_scripts-0.0.5-py3-none-any.whl" \
&& pip3 install --no-cache-dir "astronomer-fab-security-manager~=1.2, >=1.2.2" \
&& apk del .build-deps py3-numpy-dev \
Expand Down