Merge "Include LibYAML in container builds"

images/airflow/Dockerfile.opensuse_15

@@ -52,6 +52,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
 RUN set -ex && \
     zypper -q update -y ;\
     zypper --non-interactive install --no-recommends \
+        automake \
         ca-certificates \
         curl \
         git-core \
@@ -59,6 +60,7 @@ RUN set -ex && \
         libffi-devel \
         libopenssl-devel \
         libpqxx-devel \
+        libtool \
         gcc-locale \
         netcat-openbsd \
         netcfg \
@@ -83,6 +85,21 @@ RUN pip3 install -U pip \
 # Explicitly need to create usergroup with same name in suse
 RUN useradd -U -ms /bin/bash -d ${AIRFLOW_HOME} airflow
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Things that change mostly infrequently
 RUN curl -L -o /usr/local/bin/kubectl \
        https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \

images/airflow/Dockerfile.ubuntu_bionic

@@ -53,6 +53,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
 RUN set -ex && \
     apt-get -qq update && \
     apt-get -y install \
+    automake \
     ca-certificates \
     curl \
     git \
@@ -60,6 +61,7 @@ RUN set -ex && \
     libffi-dev \
     libssl-dev \
     libpq-dev \
+    libtool \
     locales \
     netcat \
     netbase \
@@ -80,6 +82,21 @@ RUN set -ex && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Things that change mostly infrequently
 RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
     && curl -L -o /usr/local/bin/kubectl \

images/airflow/Dockerfile.ubuntu_xenial

@@ -53,6 +53,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
 RUN set -ex && \
     apt-get -qq update && \
     apt-get -y install \
+    automake \
     ca-certificates \
     curl \
     git \
@@ -60,6 +61,7 @@ RUN set -ex && \
     libffi-dev \
     libssl-dev \
     libpq-dev \
+    libtool \
     locales \
     netcat \
     netbase \
@@ -80,6 +82,21 @@ RUN set -ex && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Things that change mostly infrequently
 RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
     && curl -L -o /usr/local/bin/kubectl \

images/shipyard/Dockerfile.opensuse_15

@@ -38,8 +38,13 @@ RUN set -ex && \
     zypper --gpg-auto-import-keys refresh && \
     zypper -q update -y && \
     zypper --non-interactive install --no-recommends \
+        automake \
         ca-certificates \
         curl \
+        gcc-c++ \
+        git \
+        libtool \
+        make \
         netcfg \
         python3 \
         python3-devel \
@@ -52,6 +57,21 @@ RUN set -ex && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Create shipyard user
 RUN useradd -ms /bin/bash shipyard \
     && mkdir -p /home/shipyard/shipyard \

images/shipyard/Dockerfile.ubuntu_bionic

@@ -38,8 +38,12 @@ EXPOSE $PORT
 RUN set -ex && \
     apt-get -qq update && \
     apt-get -y install \
+    automake \
     ca-certificates \
     curl \
+    git \
+    libtool \
+    make \
     netbase \
     python3-dev \
     python3-setuptools \
@@ -54,6 +58,21 @@ RUN set -ex && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Create shipyard user
 RUN useradd -ms /bin/bash shipyard \
     && mkdir -p /home/shipyard/shipyard \

images/shipyard/Dockerfile.ubuntu_xenial

@@ -38,8 +38,12 @@ EXPOSE $PORT
 RUN set -ex && \
     apt-get -qq update && \
     apt-get -y install \
+    automake \
     ca-certificates \
     curl \
+    git \
+    libtool \
+    make \
     netbase \
     python3-dev \
     python3-setuptools \
@@ -54,6 +58,21 @@ RUN set -ex && \
         /usr/share/doc \
         /usr/share/doc-base
 
+# Install LibYAML
+ENV LD_LIBRARY_PATH=/usr/local/lib
+
+ARG LIBYAML_VERSION=0.2.5
+RUN set -ex \
+    && git clone https://github.com/yaml/libyaml.git \
+    && cd libyaml \
+    && git checkout $LIBYAML_VERSION \
+    && ./bootstrap \
+    && ./configure \
+    && make \
+    && make install \
+    && cd .. \
+    && rm -fr libyaml
+
 # Create shipyard user
 RUN useradd -ms /bin/bash shipyard \
     && mkdir -p /home/shipyard/shipyard \