Update elasticsearch and astroid

Dockerfile

@@ -39,6 +39,8 @@ RUN /opt/bitnami/scripts/airflow-scheduler/postunpack.sh && \
     tar xfz /local/wheels/thrift-0.14.1.tar.gz -C /local/wheels && \
     pip install --no-index --no-deps /local/wheels/thrift-0.14.1/lib/py && \
     rm -rf /local/wheels/thrift-0.14.1* && \
+    # Remove Elasticsearch 7.5.1 due to high findings CVE-2020-7019 CVE-2020-7021 CVE-2020-7020 CVE-2020-7014 CVE-2020-7009
+    rm -rf /opt/bitnami/airflow/venv/lib/python3.8/site-packages/elasticsearch && rm -rf /opt/bitnami/airflow/venv/lib/python3.8/site-packages/elasticsearch-7.5* && \
     for f in $(ls -l /local/wheels | awk '{print $9}' |sed '/^$/d'); do pip install --no-index --no-deps /local/wheels/$f; done && \
     find /opt/bitnami/airflow/venv/lib/python3.8/site-packages -name "*.pem" -o -name "*.key" | egrep ".*test.*/.*\.pem|.*test.*/.*\.key" | xargs rm -f && \
     rm -rf /local/*

hardening_manifest.yaml

@@ -2,7 +2,11 @@
 apiVersion: v1
 
 # The repository name in registry1, excluding /ironbank/
+<<<<<<< HEAD
 name: "bitnami/airflow-sheduler"
+=======
+name: "bitnami/airflow-scheduler"
+>>>>>>> 7b8c32464a35f83c1ec26a664c90f9eab4a3156e
 
 # List of tags to push for the repository in registry1
 # The most specific version should be the first tag and will be shown
@@ -68,6 +72,21 @@ resources:
   validation:
     type: sha256
     value: 46999df6e2cde8773739f7c3bd1eb5846d4b7dc1ef6e2161f3b6d1d0f21726ba
+- filename: pytest-6.2.3-py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/76/4d/9c00146923da9f1cabd1878209d71b1380d537ec331a1a613e8f4b9d7985/pytest-6.2.3-py3-none-any.whl
+  validation:
+    type: sha256
+    value: 6ad9c7bdf517a808242b998ac20063c41532a570d088d77eec1ee12b0b5574bc
+- filename: astroid-2.5.1-py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/f1/49/d51e5ce77ea234ee416966e489283512a9852f78d9ff125747eae29e7b69/astroid-2.5.1-py3-none-any.whl
+  validation:
+    type: sha256
+    value: 21d735aab248253531bb0f1e1e6d068f0ee23533e18ae8a6171ff892b98297cf
+- filename: elasticsearch-7.11.0-py2.py3-none-any.whl
+  url: https://files.pythonhosted.org/packages/72/68/76c5d46cc6a48fddb759f585bc8728caa11bfc9b812ce6705fc5f99beab2/elasticsearch-7.11.0-py2.py3-none-any.whl
+  validation:
+    type: sha256
+    value: a113cfcee9ba8565cd48a67b60e9903b67a81b3b80ddc6d3fb2c16789a58b763
 
 # List of project maintainers
 maintainers:

trufflehog-config.yaml

+skip_strings:
+  # will only be skipped in corresponding files
+  rootfs/opt/bitnami/scripts/libairflow.sh:
+    - 'airflow_conf_set "celery" "broker_url" "redis://${redis_user}:${redis_password}@${REDIS_HOST}:${REDIS_PORT_NUMBER}/1"'
+skip_paths:
+  - trufflehog-config.yaml