airship/deckhand
Code Issues Proposed changes

Include LibYAML in container builds

Browse Source 
Updates Dockerfiles to build the LibYAML library, which can provide much
faster YAML parsing and emitting than the native Python library.

https://pyyaml.org/wiki/LibYAML

Change-Id: I1c6f41a72c7d32e810cf64f572dc2a1cc6a1e710
This commit is contained in:
Phil Sphicas 2020-09-09 02:26:07 +00:00
parent 0325f82d55
commit 9c8069d26a
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
images/deckhand/Dockerfile.opensuse_15
View File

@ -31,6 +31,7 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
zypper -q update -y && \ zypper -q update -y && \
zypper install -y --no-recommends \ zypper install -y --no-recommends \
automake \
ca-certificates \ ca-certificates \
curl \ curl \
gcc \ gcc \
@ -39,6 +40,7 @@ RUN set -x && \
libffi-devel \ libffi-devel \
libopenssl-devel \ libopenssl-devel \
libpqxx-devel \ libpqxx-devel \
libtool \
make \ make \
netcat-openbsd \ netcat-openbsd \
netcfg \ netcfg \
@ -61,6 +63,21 @@ RUN pip3 install -U pip \
/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 deckhand user # Create deckhand user
RUN useradd -ms /bin/bash deckhand RUN useradd -ms /bin/bash deckhand

17
images/deckhand/Dockerfile.ubuntu_bionic
View File

@ -32,6 +32,7 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -y install \ apt-get -y install \
automake \
ca-certificates \ ca-certificates \
curl \ curl \
g++ \ g++ \
@ -40,6 +41,7 @@ RUN set -x && \
libffi-dev \ libffi-dev \
libpq-dev \ libpq-dev \
libssl-dev \ libssl-dev \
libtool \
make \ make \
netbase \ netbase \
netcat \ netcat \
@ -59,6 +61,21 @@ RUN set -x && \
/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 deckhand user # Create deckhand user
RUN useradd -ms /bin/bash deckhand RUN useradd -ms /bin/bash deckhand

17
images/deckhand/Dockerfile.ubuntu_xenial
View File

@ -32,6 +32,7 @@ EXPOSE $PORT
RUN set -x && \ RUN set -x && \
apt-get -qq update && \ apt-get -qq update && \
apt-get -y install \ apt-get -y install \
automake \
ca-certificates \ ca-certificates \
curl \ curl \
g++ \ g++ \
@ -40,6 +41,7 @@ RUN set -x && \
libffi-dev \ libffi-dev \
libpq-dev \ libpq-dev \
libssl-dev \ libssl-dev \
libtool \
make \ make \
netbase \ netbase \
netcat \ netcat \
@ -59,6 +61,21 @@ RUN set -x && \
/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 deckhand user # Create deckhand user
RUN useradd -ms /bin/bash deckhand RUN useradd -ms /bin/bash deckhand