Upgrade LibYAML version in container builds
This change installs libyaml from the source repo (currently at version 0.2.5), instead of the old versions from the Ubuntu mirrors (0.1.6-3 for xenial and 0.1.7-2ubuntu3 for bionic). https://github.com/yaml/libyaml https://packages.ubuntu.com/xenial/libyaml-dev https://packages.ubuntu.com/bionic/libyaml-dev Change-Id: Idf7f3168f1c123db8406cb668cae5c9c9066a8fe
This commit is contained in:
parent
6d7df808f3
commit
14a95e65d1
@ -39,6 +39,7 @@ ENTRYPOINT ["/opt/promenade/entrypoint.sh"]
|
||||
RUN set -ex \
|
||||
&& apt-get update -qq \
|
||||
&& apt-get install --no-install-recommends -y \
|
||||
automake \
|
||||
ca-certificates \
|
||||
curl \
|
||||
dnsutils \
|
||||
@ -47,7 +48,8 @@ RUN set -ex \
|
||||
gpg \
|
||||
gpg-agent \
|
||||
libpcre3-dev \
|
||||
libyaml-dev \
|
||||
libtool \
|
||||
make \
|
||||
python3-dev \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
@ -61,6 +63,21 @@ RUN set -ex \
|
||||
&& useradd -u 1000 -g users -d /opt/promenade promenade \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 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
|
||||
|
||||
COPY requirements-frozen.txt /opt/promenade
|
||||
RUN pip3 install --no-cache-dir -r requirements-frozen.txt
|
||||
|
||||
|
@ -39,6 +39,7 @@ ENTRYPOINT ["/opt/promenade/entrypoint.sh"]
|
||||
RUN set -ex \
|
||||
&& apt-get update -qq \
|
||||
&& apt-get install --no-install-recommends -y \
|
||||
automake \
|
||||
ca-certificates \
|
||||
curl \
|
||||
dnsutils \
|
||||
@ -46,7 +47,8 @@ RUN set -ex \
|
||||
git \
|
||||
libpcre3-dev \
|
||||
libssl-dev \
|
||||
libyaml-dev \
|
||||
libtool \
|
||||
make \
|
||||
python3-dev \
|
||||
python3-pip \
|
||||
python3-setuptools \
|
||||
@ -60,6 +62,21 @@ RUN set -ex \
|
||||
&& useradd -u 1000 -g users -d /opt/promenade promenade \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
# 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
|
||||
|
||||
COPY requirements-frozen.txt /opt/promenade
|
||||
RUN pip3 install --no-cache-dir -r requirements-frozen.txt
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user