summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlof Nord <olof.nord@tutanota.com>2023-03-19 14:54:31 +0100
committerdormando <dormando@rydia.net>2023-04-10 17:36:34 -0700
commit6a3c554972723e27905924c5db9605e3374a28d4 (patch)
treeef38447f79002bef8834173e1f1f83321f494429
parent455a264799793e000c6da9846fc5bd410fed7924 (diff)
downloadmemcached-6a3c554972723e27905924c5db9605e3374a28d4.tar.gz
Add a debian dockerfile, as well as upgrade the autoconf dependency
-rw-r--r--devtools/Dockerfile.debian17
-rw-r--r--devtools/Dockerfile.ubuntu2
-rw-r--r--docker-compose.yml4
3 files changed, 22 insertions, 1 deletions
diff --git a/devtools/Dockerfile.debian b/devtools/Dockerfile.debian
new file mode 100644
index 0000000..b12d783
--- /dev/null
+++ b/devtools/Dockerfile.debian
@@ -0,0 +1,17 @@
+FROM debian:latest
+
+ARG CONFIGURE_OPTS="--enable-seccomp"
+
+RUN apt-get update && apt-get install -y build-essential automake autoconf libevent-dev libseccomp-dev git pkg-config
+
+RUN useradd -ms /bin/bash memcached
+ADD . /src
+WORKDIR /src
+
+RUN ./autogen.sh
+RUN ./configure ${CONFIGURE_OPTS}
+RUN make -j
+
+USER memcached
+
+CMD make test
diff --git a/devtools/Dockerfile.ubuntu b/devtools/Dockerfile.ubuntu
index b30fe27..26c1d52 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 pkg-config
+RUN apt-get update && apt-get install -y build-essential automake autoconf libevent-dev libseccomp-dev git pkg-config
RUN useradd -ms /bin/bash memcached
ADD . /src
diff --git a/docker-compose.yml b/docker-compose.yml
index 8564ee3..0348134 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,6 +8,10 @@ services:
build:
context: .
dockerfile: devtools/Dockerfile.ubuntu
+ debian:
+ build:
+ context: .
+ dockerfile: devtools/Dockerfile.debian
arch:
build:
context: .