fix: update bird build script and Dockerfile to remove readline dependency
CI / changes (push) Successful in 7s
CI / openapi (push) Has been skipped
CI / go (push) Has been skipped
CI / docker-web (push) Has been skipped
CI / docker-bird (push) Successful in 43s
CI / bird2 (push) Successful in 18s
CI / docker-go (push) Failing after 2m4s
CI / changes (push) Successful in 7s
CI / openapi (push) Has been skipped
CI / go (push) Has been skipped
CI / docker-web (push) Has been skipped
CI / docker-bird (push) Successful in 43s
CI / bird2 (push) Successful in 18s
CI / docker-go (push) Failing after 2m4s
Modified the bird build script to disable readline support, streamlining the installation process. Updated the Dockerfile to include the necessary libreadline8 package for the birdc runtime, ensuring compatibility while reducing unnecessary dependencies in the build phase.
This commit is contained in:
@@ -11,21 +11,19 @@ apt-get install -y --no-install-recommends \
|
|||||||
ca-certificates \
|
ca-certificates \
|
||||||
curl \
|
curl \
|
||||||
flex \
|
flex \
|
||||||
bison \
|
bison
|
||||||
libncurses-dev \
|
|
||||||
libreadline-dev
|
|
||||||
|
|
||||||
cd /tmp
|
cd /tmp
|
||||||
rm -rf "bird-${BIRD_VERSION}"
|
rm -rf "bird-${BIRD_VERSION}"
|
||||||
curl -fsSL "https://bird.network.cz/download/bird-${BIRD_VERSION}.tar.gz" | tar xz
|
curl -fsSL "https://bird.network.cz/download/bird-${BIRD_VERSION}.tar.gz" | tar xz
|
||||||
cd "bird-${BIRD_VERSION}"
|
cd "bird-${BIRD_VERSION}"
|
||||||
./configure --prefix=/usr/local --enable-client
|
# birdc only for non-interactive "show protocols" / configure — без readline в runtime.
|
||||||
|
./configure --prefix=/usr/local --enable-client --disable-readline
|
||||||
make -j"$(nproc)"
|
make -j"$(nproc)"
|
||||||
make install
|
make install
|
||||||
cd /
|
cd /
|
||||||
rm -rf "/tmp/bird-${BIRD_VERSION}"
|
rm -rf "/tmp/bird-${BIRD_VERSION}"
|
||||||
|
|
||||||
apt-get purge -y build-essential flex bison libncurses-dev libreadline-dev
|
apt-get purge -y build-essential flex bison
|
||||||
apt-get autoremove -y
|
apt-get autoremove -y
|
||||||
apt-get install -y --no-install-recommends libreadline8 libtinfo6
|
|
||||||
rm -rf /var/lib/apt/lists/*
|
rm -rf /var/lib/apt/lists/*
|
||||||
|
|||||||
@@ -46,4 +46,8 @@ EXPOSE 8080
|
|||||||
ENTRYPOINT ["/usr/local/bin/evobgp"]
|
ENTRYPOINT ["/usr/local/bin/evobgp"]
|
||||||
|
|
||||||
FROM runtime AS runtime-birdc
|
FROM runtime AS runtime-birdc
|
||||||
|
# birdc, собранный с readline, требует libreadline8 в runtime (bookworm).
|
||||||
|
RUN apt-get update \
|
||||||
|
&& apt-get install -y --no-install-recommends libreadline8 \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
COPY --from=birdc /usr/local/sbin/bird /usr/local/sbin/birdc /usr/local/sbin/
|
COPY --from=birdc /usr/local/sbin/bird /usr/local/sbin/birdc /usr/local/sbin/
|
||||||
|
|||||||
Reference in New Issue
Block a user