[airflow] 17/44: Update Dockerfile (#12987)

[ka...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kaxilnaik pushed a commit to branch v1-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit bfde73556963a0e53e33bba1acdbdf8bb0b626d5
Author: jao6693 <fb...@gmail.com>
AuthorDate: Thu Dec 10 21:01:49 2020 +0100

    Update Dockerfile (#12987)
    
    Fix permission issue in Azure DevOps when running the script install_mysql.sh, which prevents the build to succeed
    
    /bin/bash: ./scripts/docker/install_mysql.sh: Permission denied
    The command '/bin/bash -o pipefail -e -u -x -c ./scripts/docker/install_mysql.sh dev' returned a non-zero code: 126
    ##[error]The command '/bin/bash -o pipefail -e -u -x -c ./scripts/docker/install_mysql.sh dev' returned a non-zero code: 126
    ##[error]The process '/usr/bin/docker' failed with exit code 126
    
    (cherry picked from commit 2ec03cd9267f1cfd7fa3fa437ffad7deee3241e8)
---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index eaac1e1..23a9915 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -144,9 +144,10 @@ RUN mkdir -pv /usr/share/man/man1 \
 ARG INSTALL_MYSQL_CLIENT="true"
 ENV INSTALL_MYSQL_CLIENT=${INSTALL_MYSQL_CLIENT}
 
-COPY scripts/docker scripts/docker
+COPY scripts/docker /scripts/docker
 COPY docker-context-files /docker-context-files
-
+# fix permission issue in Azure DevOps when running the script
+RUN chmod a+x /scripts/docker/install_mysql.sh
 RUN ./scripts/docker/install_mysql.sh dev
 
 ARG AIRFLOW_REPO=apache/airflow
@@ -372,7 +373,9 @@ RUN mkdir -pv /usr/share/man/man1 \
 ARG INSTALL_MYSQL_CLIENT="true"
 ENV INSTALL_MYSQL_CLIENT=${INSTALL_MYSQL_CLIENT}
 
-COPY scripts/docker scripts/docker
+COPY scripts/docker /scripts/docker
+# fix permission issue in Azure DevOps when running the script
+RUN chmod a+x /scripts/docker/install_mysql.sh
 RUN ./scripts/docker/install_mysql.sh prod
 
 ENV AIRFLOW_UID=${AIRFLOW_UID}