Merge "Upgrade LibYAML version in container builds"
This commit is contained in:
commit
5ac0d8c35d
|
@ -34,8 +34,23 @@ RUN echo "deb ${UBUNTU_REPO} bionic main restricted universe multiverse" > /etc
|
||||||
COPY ./tools/baclient_build.sh /tmp/drydock/
|
COPY ./tools/baclient_build.sh /tmp/drydock/
|
||||||
COPY ./go /tmp/drydock/go
|
COPY ./go /tmp/drydock/go
|
||||||
WORKDIR /tmp/drydock
|
WORKDIR /tmp/drydock
|
||||||
RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient; \
|
RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
|
||||||
rm -r /var/lib/apt/lists/*
|
|
||||||
|
# Build LibYAML
|
||||||
|
ARG LIBYAML_VERSION=0.2.5
|
||||||
|
RUN set -ex \
|
||||||
|
&& apt install -y git automake make libtool \
|
||||||
|
&& git clone https://github.com/yaml/libyaml.git \
|
||||||
|
&& cd libyaml \
|
||||||
|
&& git checkout $LIBYAML_VERSION \
|
||||||
|
&& ./bootstrap \
|
||||||
|
&& ./configure \
|
||||||
|
&& make \
|
||||||
|
&& make install \
|
||||||
|
&& cd .. \
|
||||||
|
&& rm -fr libyaml
|
||||||
|
|
||||||
|
RUN rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
FROM ${FROM}
|
FROM ${FROM}
|
||||||
|
@ -72,6 +87,11 @@ WORKDIR /tmp/drydock
|
||||||
RUN ./hostdeps.sh; \
|
RUN ./hostdeps.sh; \
|
||||||
rm -r /var/lib/apt/lists/*
|
rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install LibYAML
|
||||||
|
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||||
|
COPY --from=baclient_builder /usr/local/lib /usr/local/lib
|
||||||
|
COPY --from=baclient_builder /usr/local/include/yaml.h /usr/local/include/yaml.h
|
||||||
|
|
||||||
COPY ./python/requirements-lock.txt /tmp/drydock/
|
COPY ./python/requirements-lock.txt /tmp/drydock/
|
||||||
RUN pip3 install \
|
RUN pip3 install \
|
||||||
--no-cache-dir \
|
--no-cache-dir \
|
||||||
|
|
|
@ -34,8 +34,23 @@ RUN echo "deb ${UBUNTU_REPO} xenial main restricted universe multiverse" > /etc
|
||||||
COPY ./tools/baclient_build.sh /tmp/drydock/
|
COPY ./tools/baclient_build.sh /tmp/drydock/
|
||||||
COPY ./go /tmp/drydock/go
|
COPY ./go /tmp/drydock/go
|
||||||
WORKDIR /tmp/drydock
|
WORKDIR /tmp/drydock
|
||||||
RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient; \
|
RUN ./baclient_build.sh /tmp/drydock/go /tmp/drydock/baclient
|
||||||
rm -r /var/lib/apt/lists/*
|
|
||||||
|
# Build LibYAML
|
||||||
|
ARG LIBYAML_VERSION=0.2.5
|
||||||
|
RUN set -ex \
|
||||||
|
&& apt install -y git automake make libtool \
|
||||||
|
&& git clone https://github.com/yaml/libyaml.git \
|
||||||
|
&& cd libyaml \
|
||||||
|
&& git checkout $LIBYAML_VERSION \
|
||||||
|
&& ./bootstrap \
|
||||||
|
&& ./configure \
|
||||||
|
&& make \
|
||||||
|
&& make install \
|
||||||
|
&& cd .. \
|
||||||
|
&& rm -fr libyaml
|
||||||
|
|
||||||
|
RUN rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
|
||||||
FROM ${FROM}
|
FROM ${FROM}
|
||||||
|
@ -59,7 +74,7 @@ ENV LC_ALL C.UTF-8
|
||||||
ENV LANG C.UTF-8
|
ENV LANG C.UTF-8
|
||||||
|
|
||||||
# Copy direct dependency requirements only to build a dependency layer
|
# Copy direct dependency requirements only to build a dependency layer
|
||||||
RUN echo "deb ${UBUNTU_REPO} xenial main restricted universe multiverse" > /etc/apt/sources.list; \
|
RUN echo "deb ${UBUNTU_REPO} xenial main restricted universe multiverse" > /etc/apt/sources.list; \
|
||||||
echo "deb ${UBUNTU_REPO} xenial-security main restricted universe multiverse" >> /etc/apt/sources.list; \
|
echo "deb ${UBUNTU_REPO} xenial-security main restricted universe multiverse" >> /etc/apt/sources.list; \
|
||||||
echo "deb ${UBUNTU_REPO} xenial-updates main restricted universe multiverse" >> /etc/apt/sources.list; \
|
echo "deb ${UBUNTU_REPO} xenial-updates main restricted universe multiverse" >> /etc/apt/sources.list; \
|
||||||
cat /etc/apt/sources.list; \
|
cat /etc/apt/sources.list; \
|
||||||
|
@ -72,6 +87,11 @@ WORKDIR /tmp/drydock
|
||||||
RUN ./hostdeps.sh; \
|
RUN ./hostdeps.sh; \
|
||||||
rm -r /var/lib/apt/lists/*
|
rm -r /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
# Install LibYAML
|
||||||
|
ENV LD_LIBRARY_PATH=/usr/local/lib
|
||||||
|
COPY --from=baclient_builder /usr/local/lib /usr/local/lib
|
||||||
|
COPY --from=baclient_builder /usr/local/include/yaml.h /usr/local/include/yaml.h
|
||||||
|
|
||||||
COPY ./python/requirements-lock.txt /tmp/drydock/
|
COPY ./python/requirements-lock.txt /tmp/drydock/
|
||||||
RUN pip3 install \
|
RUN pip3 install \
|
||||||
--no-cache-dir \
|
--no-cache-dir \
|
||||||
|
|
|
@ -1,7 +1,6 @@
|
||||||
# These are host packages needed for Drydock
|
# These are host packages needed for Drydock
|
||||||
# that don't come on a minimal Ubuntu install
|
# that don't come on a minimal Ubuntu install
|
||||||
libvirt-dev
|
libvirt-dev
|
||||||
libyaml-dev
|
|
||||||
pkg-config
|
pkg-config
|
||||||
python3-dev
|
python3-dev
|
||||||
gcc
|
gcc
|
||||||
|
|
Loading…
Reference in New Issue