Merge "Include LibYAML in container builds"
This commit is contained in:
commit
24d301851a
|
@ -52,6 +52,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
zypper -q update -y ;\
|
zypper -q update -y ;\
|
||||||
zypper --non-interactive install --no-recommends \
|
zypper --non-interactive install --no-recommends \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
git-core \
|
git-core \
|
||||||
|
@ -59,6 +60,7 @@ RUN set -ex && \
|
||||||
libffi-devel \
|
libffi-devel \
|
||||||
libopenssl-devel \
|
libopenssl-devel \
|
||||||
libpqxx-devel \
|
libpqxx-devel \
|
||||||
|
libtool \
|
||||||
gcc-locale \
|
gcc-locale \
|
||||||
netcat-openbsd \
|
netcat-openbsd \
|
||||||
netcfg \
|
netcfg \
|
||||||
|
@ -83,6 +85,21 @@ RUN pip3 install -U pip \
|
||||||
# Explicitly need to create usergroup with same name in suse
|
# Explicitly need to create usergroup with same name in suse
|
||||||
RUN useradd -U -ms /bin/bash -d ${AIRFLOW_HOME} airflow
|
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
|
# Things that change mostly infrequently
|
||||||
RUN curl -L -o /usr/local/bin/kubectl \
|
RUN curl -L -o /usr/local/bin/kubectl \
|
||||||
https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
|
https://storage.googleapis.com/kubernetes-release/release/v${KUBECTL_VERSION}/bin/linux/amd64/kubectl \
|
||||||
|
|
|
@ -53,6 +53,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
apt-get -qq update && \
|
apt-get -qq update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
git \
|
git \
|
||||||
|
@ -60,6 +61,7 @@ RUN set -ex && \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
|
libtool \
|
||||||
locales \
|
locales \
|
||||||
netcat \
|
netcat \
|
||||||
netbase \
|
netbase \
|
||||||
|
@ -80,6 +82,21 @@ RUN set -ex && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
# Things that change mostly infrequently
|
||||||
RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
|
RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
|
||||||
&& curl -L -o /usr/local/bin/kubectl \
|
&& curl -L -o /usr/local/bin/kubectl \
|
||||||
|
|
|
@ -53,6 +53,7 @@ ENV AIRFLOW_HOME=${AIRFLOW_HOME}
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
apt-get -qq update && \
|
apt-get -qq update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
git \
|
git \
|
||||||
|
@ -60,6 +61,7 @@ RUN set -ex && \
|
||||||
libffi-dev \
|
libffi-dev \
|
||||||
libssl-dev \
|
libssl-dev \
|
||||||
libpq-dev \
|
libpq-dev \
|
||||||
|
libtool \
|
||||||
locales \
|
locales \
|
||||||
netcat \
|
netcat \
|
||||||
netbase \
|
netbase \
|
||||||
|
@ -80,6 +82,21 @@ RUN set -ex && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
# Things that change mostly infrequently
|
||||||
RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
|
RUN useradd -ms /bin/bash -d ${AIRFLOW_HOME} airflow \
|
||||||
&& curl -L -o /usr/local/bin/kubectl \
|
&& curl -L -o /usr/local/bin/kubectl \
|
||||||
|
|
|
@ -38,8 +38,13 @@ RUN set -ex && \
|
||||||
zypper --gpg-auto-import-keys refresh && \
|
zypper --gpg-auto-import-keys refresh && \
|
||||||
zypper -q update -y && \
|
zypper -q update -y && \
|
||||||
zypper --non-interactive install --no-recommends \
|
zypper --non-interactive install --no-recommends \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
gcc-c++ \
|
||||||
|
git \
|
||||||
|
libtool \
|
||||||
|
make \
|
||||||
netcfg \
|
netcfg \
|
||||||
python3 \
|
python3 \
|
||||||
python3-devel \
|
python3-devel \
|
||||||
|
@ -52,6 +57,21 @@ RUN set -ex && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
# Create shipyard user
|
||||||
RUN useradd -ms /bin/bash shipyard \
|
RUN useradd -ms /bin/bash shipyard \
|
||||||
&& mkdir -p /home/shipyard/shipyard \
|
&& mkdir -p /home/shipyard/shipyard \
|
||||||
|
|
|
@ -38,8 +38,12 @@ EXPOSE $PORT
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
apt-get -qq update && \
|
apt-get -qq update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
git \
|
||||||
|
libtool \
|
||||||
|
make \
|
||||||
netbase \
|
netbase \
|
||||||
python3-dev \
|
python3-dev \
|
||||||
python3-setuptools \
|
python3-setuptools \
|
||||||
|
@ -54,6 +58,21 @@ RUN set -ex && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
# Create shipyard user
|
||||||
RUN useradd -ms /bin/bash shipyard \
|
RUN useradd -ms /bin/bash shipyard \
|
||||||
&& mkdir -p /home/shipyard/shipyard \
|
&& mkdir -p /home/shipyard/shipyard \
|
||||||
|
|
|
@ -38,8 +38,12 @@ EXPOSE $PORT
|
||||||
RUN set -ex && \
|
RUN set -ex && \
|
||||||
apt-get -qq update && \
|
apt-get -qq update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
|
automake \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
|
git \
|
||||||
|
libtool \
|
||||||
|
make \
|
||||||
netbase \
|
netbase \
|
||||||
python3-dev \
|
python3-dev \
|
||||||
python3-setuptools \
|
python3-setuptools \
|
||||||
|
@ -54,6 +58,21 @@ RUN set -ex && \
|
||||||
/usr/share/doc \
|
/usr/share/doc \
|
||||||
/usr/share/doc-base
|
/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
|
# Create shipyard user
|
||||||
RUN useradd -ms /bin/bash shipyard \
|
RUN useradd -ms /bin/bash shipyard \
|
||||||
&& mkdir -p /home/shipyard/shipyard \
|
&& mkdir -p /home/shipyard/shipyard \
|
||||||
|
|
Loading…
Reference in New Issue