This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new 3db4656 Protect agains images not being pulled properly (#18435)
3db4656 is described below
commit 3db4656e78a8172f108c0ebd104f5c53f322a589
Author: Jarek Potiuk <[email protected]>
AuthorDate: Wed Sep 22 23:42:55 2021 +0200
Protect agains images not being pulled properly (#18435)
Recently we had a problem that our CI got broken because
pulled images were not tagged properly after #17883 missed image
tagging. This has been fixed in #18433 but the problem is that this
might happen in the future and mignt not get noticed on time.
This PR prevents from similar situations happnening. Whenever we
try to run doc building or tests we set --pull policy to never
for both docker and docker compose which should simply fail if
the images were not pulled and tagged properly rather than
fail over to pulling latest `main` image.
---
scripts/ci/docker-compose/backend-mssql-bind-volume.yml | 1 -
scripts/ci/docker-compose/backend-mssql-docker-volume.yml | 1 -
scripts/ci/docker-compose/backend-mssql-port.yml | 1 -
scripts/ci/docker-compose/backend-mssql.yml | 1 -
scripts/ci/docker-compose/backend-mysql-port.yml | 1 -
scripts/ci/docker-compose/backend-mysql.yml | 2 --
scripts/ci/docker-compose/backend-postgres-port.yml | 1 -
scripts/ci/docker-compose/backend-postgres.yml | 1 -
scripts/ci/docker-compose/backend-sqlite-port.yml | 4 +++-
scripts/ci/docker-compose/backend-sqlite.yml | 1 -
scripts/ci/docker-compose/base.yml | 2 +-
scripts/ci/docker-compose/files.yml | 1 -
scripts/ci/docker-compose/forward-credentials.yml | 1 -
scripts/ci/docker-compose/ga.yml | 1 -
scripts/ci/docker-compose/integration-cassandra.yml | 1 -
scripts/ci/docker-compose/integration-kerberos.yml | 1 -
scripts/ci/docker-compose/integration-mongo.yml | 1 -
scripts/ci/docker-compose/integration-openldap.yml | 1 -
scripts/ci/docker-compose/integration-pinot.yml | 1 -
scripts/ci/docker-compose/integration-rabbitmq.yml | 1 -
scripts/ci/docker-compose/integration-redis.yml | 1 -
scripts/ci/docker-compose/integration-statsd.yml | 1 -
scripts/ci/docker-compose/integration-trino.yml | 1 -
scripts/ci/docker-compose/local-all-sources.yml | 1 -
scripts/ci/docker-compose/local.yml | 1 -
scripts/ci/docker-compose/remove-sources.yml | 1 -
scripts/ci/libraries/_runs.sh | 5 +++++
27 files changed, 9 insertions(+), 27 deletions(-)
diff --git a/scripts/ci/docker-compose/backend-mssql-bind-volume.yml
b/scripts/ci/docker-compose/backend-mssql-bind-volume.yml
index 7c827a4..359ef2d 100644
--- a/scripts/ci/docker-compose/backend-mssql-bind-volume.yml
+++ b/scripts/ci/docker-compose/backend-mssql-bind-volume.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
mssql:
volumes:
diff --git a/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
b/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
index 9368d56..850bf15 100644
--- a/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
+++ b/scripts/ci/docker-compose/backend-mssql-docker-volume.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
mssql:
volumes:
diff --git a/scripts/ci/docker-compose/backend-mssql-port.yml
b/scripts/ci/docker-compose/backend-mssql-port.yml
index 42fd418..dbfd43b 100644
--- a/scripts/ci/docker-compose/backend-mssql-port.yml
+++ b/scripts/ci/docker-compose/backend-mssql-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
mssql:
ports:
diff --git a/scripts/ci/docker-compose/backend-mssql.yml
b/scripts/ci/docker-compose/backend-mssql.yml
index 71880ed..5990cce 100644
--- a/scripts/ci/docker-compose/backend-mssql.yml
+++ b/scripts/ci/docker-compose/backend-mssql.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/backend-mysql-port.yml
b/scripts/ci/docker-compose/backend-mysql-port.yml
index 495f5f7..6555a13 100644
--- a/scripts/ci/docker-compose/backend-mysql-port.yml
+++ b/scripts/ci/docker-compose/backend-mysql-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
mysql:
ports:
diff --git a/scripts/ci/docker-compose/backend-mysql.yml
b/scripts/ci/docker-compose/backend-mysql.yml
index 02f86bd..dd5c3a4 100644
--- a/scripts/ci/docker-compose/backend-mysql.yml
+++ b/scripts/ci/docker-compose/backend-mysql.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
environment:
@@ -26,7 +25,6 @@ services:
depends_on:
mysql:
condition: service_healthy
-
mysql:
image: mysql:${MYSQL_VERSION}
environment:
diff --git a/scripts/ci/docker-compose/backend-postgres-port.yml
b/scripts/ci/docker-compose/backend-postgres-port.yml
index a7d78f9..1ad3387 100644
--- a/scripts/ci/docker-compose/backend-postgres-port.yml
+++ b/scripts/ci/docker-compose/backend-postgres-port.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
postgres:
ports:
diff --git a/scripts/ci/docker-compose/backend-postgres.yml
b/scripts/ci/docker-compose/backend-postgres.yml
index df3615d..b3e9025 100644
--- a/scripts/ci/docker-compose/backend-postgres.yml
+++ b/scripts/ci/docker-compose/backend-postgres.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/backend-sqlite-port.yml
b/scripts/ci/docker-compose/backend-sqlite-port.yml
index c7bbb7d..c73580f 100644
--- a/scripts/ci/docker-compose/backend-sqlite-port.yml
+++ b/scripts/ci/docker-compose/backend-sqlite-port.yml
@@ -15,4 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
+services:
+ sqlite:
+ ports: []
diff --git a/scripts/ci/docker-compose/backend-sqlite.yml
b/scripts/ci/docker-compose/backend-sqlite.yml
index a8cf838..6bb324f 100644
--- a/scripts/ci/docker-compose/backend-sqlite.yml
+++ b/scripts/ci/docker-compose/backend-sqlite.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/base.yml
b/scripts/ci/docker-compose/base.yml
index 255bb74..3a80092 100644
--- a/scripts/ci/docker-compose/base.yml
+++ b/scripts/ci/docker-compose/base.yml
@@ -15,10 +15,10 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
image: ${AIRFLOW_CI_IMAGE}
+ pull_policy: never
environment:
- USER=root
- ADDITIONAL_PATH=~/.local/bin
diff --git a/scripts/ci/docker-compose/files.yml
b/scripts/ci/docker-compose/files.yml
index 2925bd9..ae6e327 100644
--- a/scripts/ci/docker-compose/files.yml
+++ b/scripts/ci/docker-compose/files.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
volumes:
diff --git a/scripts/ci/docker-compose/forward-credentials.yml
b/scripts/ci/docker-compose/forward-credentials.yml
index ebbd2ec..f110fe1 100644
--- a/scripts/ci/docker-compose/forward-credentials.yml
+++ b/scripts/ci/docker-compose/forward-credentials.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
# Forwards local credentials to docker image
diff --git a/scripts/ci/docker-compose/ga.yml b/scripts/ci/docker-compose/ga.yml
index 1d0c6a4..ee0870c 100644
--- a/scripts/ci/docker-compose/ga.yml
+++ b/scripts/ci/docker-compose/ga.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
environment:
diff --git a/scripts/ci/docker-compose/integration-cassandra.yml
b/scripts/ci/docker-compose/integration-cassandra.yml
index 0465bde..4b25304 100644
--- a/scripts/ci/docker-compose/integration-cassandra.yml
+++ b/scripts/ci/docker-compose/integration-cassandra.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
cassandra:
image: cassandra:3.0
diff --git a/scripts/ci/docker-compose/integration-kerberos.yml
b/scripts/ci/docker-compose/integration-kerberos.yml
index 0e79c6a..177f20c 100644
--- a/scripts/ci/docker-compose/integration-kerberos.yml
+++ b/scripts/ci/docker-compose/integration-kerberos.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
kdc-server-example-com:
image: ghcr.io/apache/airflow-krb5-kdc-server:2021.07.04
diff --git a/scripts/ci/docker-compose/integration-mongo.yml
b/scripts/ci/docker-compose/integration-mongo.yml
index 66e03fb..9497446 100644
--- a/scripts/ci/docker-compose/integration-mongo.yml
+++ b/scripts/ci/docker-compose/integration-mongo.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
mongo:
image: mongo:3
diff --git a/scripts/ci/docker-compose/integration-openldap.yml
b/scripts/ci/docker-compose/integration-openldap.yml
index eea3246..89002f8 100644
--- a/scripts/ci/docker-compose/integration-openldap.yml
+++ b/scripts/ci/docker-compose/integration-openldap.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
openldap:
image: ghcr.io/apache/airflow-openldap:2.4.50-2021.07.04
diff --git a/scripts/ci/docker-compose/integration-pinot.yml
b/scripts/ci/docker-compose/integration-pinot.yml
index 054cff4..619274b 100644
--- a/scripts/ci/docker-compose/integration-pinot.yml
+++ b/scripts/ci/docker-compose/integration-pinot.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
pinot:
image: apachepinot/pinot:latest
diff --git a/scripts/ci/docker-compose/integration-rabbitmq.yml
b/scripts/ci/docker-compose/integration-rabbitmq.yml
index 4d4aea6..19521cc 100644
--- a/scripts/ci/docker-compose/integration-rabbitmq.yml
+++ b/scripts/ci/docker-compose/integration-rabbitmq.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
rabbitmq:
image: rabbitmq:3.7
diff --git a/scripts/ci/docker-compose/integration-redis.yml
b/scripts/ci/docker-compose/integration-redis.yml
index 3cdf68c..64bb015 100644
--- a/scripts/ci/docker-compose/integration-redis.yml
+++ b/scripts/ci/docker-compose/integration-redis.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
redis:
image: redis:5.0.1
diff --git a/scripts/ci/docker-compose/integration-statsd.yml
b/scripts/ci/docker-compose/integration-statsd.yml
index 4685392..fb78008 100644
--- a/scripts/ci/docker-compose/integration-statsd.yml
+++ b/scripts/ci/docker-compose/integration-statsd.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
statsd-exporter:
image: apache/airflow:airflow-statsd-exporter-2020.09.05-v0.17.0
diff --git a/scripts/ci/docker-compose/integration-trino.yml
b/scripts/ci/docker-compose/integration-trino.yml
index d6fa6eb..beed9ff 100644
--- a/scripts/ci/docker-compose/integration-trino.yml
+++ b/scripts/ci/docker-compose/integration-trino.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
trino:
image: ghcr.io/apache/airflow-trino:359-2021.07.04
diff --git a/scripts/ci/docker-compose/local-all-sources.yml
b/scripts/ci/docker-compose/local-all-sources.yml
index d584488..653ea91 100644
--- a/scripts/ci/docker-compose/local-all-sources.yml
+++ b/scripts/ci/docker-compose/local-all-sources.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
stdin_open: true # docker run -i
diff --git a/scripts/ci/docker-compose/local.yml
b/scripts/ci/docker-compose/local.yml
index fb19ee6..ffbcfc0 100644
--- a/scripts/ci/docker-compose/local.yml
+++ b/scripts/ci/docker-compose/local.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
stdin_open: true # docker run -i
diff --git a/scripts/ci/docker-compose/remove-sources.yml
b/scripts/ci/docker-compose/remove-sources.yml
index 2ed63f2..2187a1e 100644
--- a/scripts/ci/docker-compose/remove-sources.yml
+++ b/scripts/ci/docker-compose/remove-sources.yml
@@ -15,7 +15,6 @@
# specific language governing permissions and limitations
# under the License.
---
-version: "2.2"
services:
airflow:
# Forwards local credentials to docker image
diff --git a/scripts/ci/libraries/_runs.sh b/scripts/ci/libraries/_runs.sh
index f7bb69f..16cb174 100644
--- a/scripts/ci/libraries/_runs.sh
+++ b/scripts/ci/libraries/_runs.sh
@@ -22,6 +22,7 @@ function runs::run_docs() {
docker_v run "${EXTRA_DOCKER_FLAGS[@]}" -t \
-e "GITHUB_ACTIONS=${GITHUB_ACTIONS="false"}" \
--entrypoint "/usr/local/bin/dumb-init" \
+ --pull never \
"${AIRFLOW_CI_IMAGE}" \
"--" "/opt/airflow/scripts/in_container/run_docs_build.sh" "${@}"
start_end::group_end
@@ -32,6 +33,7 @@ function runs::run_generate_constraints() {
start_end::group_start "Run generate constraints"
docker_v run "${EXTRA_DOCKER_FLAGS[@]}" \
--entrypoint "/usr/local/bin/dumb-init" \
+ --pull never \
"${AIRFLOW_CI_IMAGE}" \
"--" "/opt/airflow/scripts/in_container/run_generate_constraints.sh"
start_end::group_end
@@ -44,6 +46,7 @@ function runs::run_prepare_airflow_packages() {
--entrypoint "/usr/local/bin/dumb-init" \
-t \
-v "${AIRFLOW_SOURCES}:/opt/airflow" \
+ --pull never \
"${AIRFLOW_CI_IMAGE}" \
"--"
"/opt/airflow/scripts/in_container/run_prepare_airflow_packages.sh"
start_end::group_end
@@ -57,6 +60,7 @@ function runs::run_prepare_provider_packages() {
--entrypoint "/usr/local/bin/dumb-init" \
-t \
-v "${AIRFLOW_SOURCES}:/opt/airflow" \
+ --pull never \
"${AIRFLOW_CI_IMAGE}" \
"--"
"/opt/airflow/scripts/in_container/run_prepare_provider_packages.sh" "${@}"
}
@@ -75,6 +79,7 @@ function runs::run_prepare_provider_documentation() {
-e "NON_INTERACTIVE" \
-e "GENERATE_PROVIDERS_ISSUE" \
-e "GITHUB_TOKEN" \
+ --pull never \
"${AIRFLOW_CI_IMAGE}" \
"--"
"/opt/airflow/scripts/in_container/run_prepare_provider_documentation.sh" "${@}"
}
