Skip to content

Commit

Permalink
Bumped versions of airflow and cornflow to create new pypi versions a…
Browse files Browse the repository at this point in the history
…nd dockerhub images
  • Loading branch information
ggsdc committed Apr 16, 2024
1 parent a2229fe commit f40727e
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions cornflow-server/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# VERSION 1.0.8
# VERSION 1.0.10
# AUTHOR: [email protected]

FROM python:3.10-slim-buster
Expand All @@ -9,7 +9,7 @@ ENV DEBIAN_FRONTEND noninteractive
ENV TERM linux

# CORNFLOW vars
ARG CORNFLOW_VERSION=1.0.9
ARG CORNFLOW_VERSION=1.0.10a1

# install linux pkg
RUN apt update -y && apt-get install -y --no-install-recommends \
Expand Down
10 changes: 6 additions & 4 deletions cornflow-server/airflow_config/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# VERSION 2.7.1
# VERSION 2.9.0
# AUTHOR: [email protected]
# DESCRIPTION: Airflow 2.7.1 image personalized for use with Cornflow (from baobabsoluciones/pysolver image)
# baobab code version is 1.0.8
# DESCRIPTION: Airflow 2.9.0 image personalized for use with Cornflow (from baobabsoluciones/pysolver image)
# baobab code version is 1.0.10

FROM baobabsoluciones/pysolver:1.0
LABEL maintainer="cornflow@baobabsoluciones"
Expand All @@ -11,14 +11,16 @@ ENV DEBIAN_FRONTEND noninteractive
ENV TERM linux

# Airflow vars
ARG AIRFLOW_VERSION=2.7.1
ARG AIRFLOW_VERSION=2.9.0
ARG AIRFLOW_USER_HOME=/usr/local/airflow
ARG CONSTRAINT_URL="https://raw.githubusercontent.com/apache/airflow/constraints-${AIRFLOW_VERSION}/constraints-3.10.txt"
ARG AIRFLOW__CORE__LOAD_EXAMPLES=False
ENV AIRFLOW_HOME=${AIRFLOW_USER_HOME}

# install Airflow and extras: celery,postgres and redis
RUN pip install "apache-airflow[celery,google,postgres,redis,sendgrid]==${AIRFLOW_VERSION}" --constraint "${CONSTRAINT_URL}"
# We add these overruns due to security reasons as suggested here: https://airflow.apache.org/docs/apache-airflow/stable/installation/installing-from-pypi.html#upgrading-and-installing-dependencies-including-providers
RUN pip install "apache-airflow[celery,google,postgres,redis,sendgrid]==${AIRFLOW_VERSION} cryptography<=42.0.5 gunicorn @ git+http://github.com/benoitc/gunicorn@88fc4a43152039c28096c8ba3eeadb3fbaa4aff9 requests<=2.31.0 Werkzeug<=2.3.8"

# copy init script and config to container
COPY scripts ${AIRFLOW_HOME}/scripts
Expand Down
2 changes: 1 addition & 1 deletion cornflow-server/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

setuptools.setup(
name="cornflow",
version="1.0.9",
version="1.0.10a1",
author="baobab soluciones",
author_email="[email protected]",
description="Cornflow is an open source multi-solver optimization server with a REST API built using flask.",
Expand Down

0 comments on commit f40727e

Please sign in to comment.