From 95a82aa84d59a9208902bcb08594807280742ed8 Mon Sep 17 00:00:00 2001 From: Olof Nord Date: Sun, 29 Jan 2023 01:23:07 +0100 Subject: Add new pkg-config dependencies to dockerfiles As is documented in https://github.com/memcached/memcached/issues/932 the images does not build without this. --- devtools/Dockerfile.alpine | 2 +- devtools/Dockerfile.arch | 4 ++-- devtools/Dockerfile.fedora | 2 +- devtools/Dockerfile.ubuntu | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'devtools') diff --git a/devtools/Dockerfile.alpine b/devtools/Dockerfile.alpine index abbc1ac..fa7ba12 100644 --- a/devtools/Dockerfile.alpine +++ b/devtools/Dockerfile.alpine @@ -2,7 +2,7 @@ FROM alpine:latest ARG CONFIGURE_OPTS="--enable-seccomp" -RUN apk update && apk add --no-cache musl-dev libevent-dev libseccomp-dev linux-headers gcc make automake autoconf perl-test-harness-utils git +RUN apk update && apk add --no-cache musl-dev libevent-dev libseccomp-dev linux-headers gcc make automake autoconf perl-test-harness-utils git pkgconfig RUN adduser -S memcached ADD . /src diff --git a/devtools/Dockerfile.arch b/devtools/Dockerfile.arch index e70b620..2801958 100644 --- a/devtools/Dockerfile.arch +++ b/devtools/Dockerfile.arch @@ -1,8 +1,8 @@ -FROM archlinux/base:latest +FROM archlinux:latest ARG CONFIGURE_OPTS="--enable-seccomp" -RUN pacman -Sy && pacman --noconfirm -S gcc automake autoconf libevent libseccomp git make perl +RUN pacman -Sy && pacman --noconfirm -S gcc automake autoconf libevent libseccomp git make perl pkgconf RUN ln -s /usr/bin/core_perl/prove /usr/bin/prove RUN useradd -ms /bin/bash memcached diff --git a/devtools/Dockerfile.fedora b/devtools/Dockerfile.fedora index bc45341..bf6d653 100644 --- a/devtools/Dockerfile.fedora +++ b/devtools/Dockerfile.fedora @@ -2,7 +2,7 @@ FROM fedora:latest ARG CONFIGURE_OPTS="--enable-seccomp" -RUN dnf install -y perl automake autoconf libseccomp-devel libevent-devel gcc make git +RUN dnf install -y perl automake autoconf libseccomp-devel libevent-devel gcc make git pkgconf RUN useradd -ms /bin/bash memcached ADD . /src diff --git a/devtools/Dockerfile.ubuntu b/devtools/Dockerfile.ubuntu index 1d47d1d..b30fe27 100644 --- a/devtools/Dockerfile.ubuntu +++ b/devtools/Dockerfile.ubuntu @@ -2,7 +2,7 @@ FROM ubuntu:latest ARG CONFIGURE_OPTS="--enable-seccomp" -RUN apt-get update && apt-get install -y build-essential automake1.11 autoconf libevent-dev libseccomp-dev git +RUN apt-get update && apt-get install -y build-essential automake1.11 autoconf libevent-dev libseccomp-dev git pkg-config RUN useradd -ms /bin/bash memcached ADD . /src -- cgit v1.2.1