Add Dockerfiles for testing (#228)

oxr463 · web-flow · commit afbde91b46d7 · 2020-06-09T11:37:40.000-04:00
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,7 @@
+AUTHORS
+contrib
+COPYING
+doc
+ISSUE_TEMPLATE
+test/docker
+*.rst
diff --git a/.gitignore b/.gitignore
@@ -22,3 +22,4 @@ test/*
 !test/*.c
 !test/*.py
 !test/*.mk
+!test/docker
diff --git a/test/GNUmakefile b/test/GNUmakefile
@@ -1,8 +1,9 @@
-DIR    = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
+DIR = $(dir $(abspath $(firstword $(MAKEFILE_LIST))))
 ROOTFS = $(DIR)/rootfs
-PROOT  = $(DIR)/../src/proot
-CARE   = $(DIR)/../src/care
-CC     = gcc
+SRC_DIR = $(DIR)/../src
+PROOT = $(SRC_DIR)/proot
+CARE = $(SRC_DIR)/care
+CC = gcc
 PROOT_RAW = $(PROOT)
 
 CHECK_TESTS = $(patsubst %,check-%, $(wildcard test-*.sh) $(wildcard test-*.c))
diff --git a/test/docker/alpine/Dockerfile b/test/docker/alpine/Dockerfile
@@ -0,0 +1,5 @@
+FROM alpine:latest
+
+COPY . /usr/src/proot
+WORKDIR /usr/src/proot
+
diff --git a/test/docker/alpine/x86_64/Dockerfile b/test/docker/alpine/x86_64/Dockerfile
@@ -0,0 +1,24 @@
+FROM proot-me/proot:alpine
+
+RUN apk update && \
+    apk upgrade && \
+    apk add \
+      bash \
+      bsd-compat-headers \
+      coreutils \
+      git \
+      grep \
+      libarchive-dev \
+      libxslt \
+      linux-headers \
+      lzo \
+      make \
+      mcookie \
+      musl-dev \
+      python3-dev \
+      py3-docutils \
+      strace \
+      swig \
+      talloc-dev \
+      uthash-dev
+
diff --git a/test/docker/alpine/x86_64/clang/Dockerfile b/test/docker/alpine/x86_64/clang/Dockerfile
@@ -0,0 +1,4 @@
+FROM proot-me/proot:alpine-x86_64
+
+RUN apk add clang clang-analyzer
+
diff --git a/test/docker/alpine/x86_64/gcc/Dockerfile b/test/docker/alpine/x86_64/gcc/Dockerfile
@@ -0,0 +1,8 @@
+FROM proot-me/proot:alpine-x86_64
+
+RUN apk add \
+      --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing \
+      gcc \
+      gdb \
+      lcov
+
diff --git a/test/docker/centos/Dockerfile b/test/docker/centos/Dockerfile
@@ -0,0 +1,5 @@
+FROM centos:latest
+
+COPY . /usr/src/proot
+WORKDIR /usr/src/proot
+
diff --git a/test/docker/centos/x86_64/Dockerfile b/test/docker/centos/x86_64/Dockerfile
@@ -0,0 +1,17 @@
+FROM proot-me/proot:centos
+
+RUN yum update -y && \
+    yum install -y yum-utils && \
+    yum-config-manager --enable extras && \
+    yum makecache && \
+    yum group install -y 'Development Tools' && \
+    yum install -y \
+      git \
+      libarchive-devel \
+      libtalloc-devel \
+      python-devel \
+      sloccount \
+      strace \
+      swig \
+      uthash-devel
+
diff --git a/test/docker/centos/x86_64/clang/Dockerfile b/test/docker/centos/x86_64/clang/Dockerfile
@@ -0,0 +1,6 @@
+FROM proot-me/proot:centos-x86_64
+
+RUN yum install -y \
+      clang \
+      clang-analyzer
+
diff --git a/test/docker/centos/x86_64/gcc/Dockerfile b/test/docker/centos/x86_64/gcc/Dockerfile
@@ -0,0 +1,2 @@
+FROM proot-me/proot:centos-x86_64
+
diff --git a/test/docker/debian/Dockerfile b/test/docker/debian/Dockerfile
@@ -0,0 +1,5 @@
+FROM debian:latest
+
+COPY . /usr/src/proot
+WORKDIR /usr/src/proot
+
diff --git a/test/docker/debian/x86_64/Dockerfile b/test/docker/debian/x86_64/Dockerfile
@@ -0,0 +1,16 @@
+FROM proot-me/proot:debian
+
+RUN apt update && \
+    apt install -y \
+      curl \
+      docutils-common \
+      git \
+      libarchive-dev \
+      libtalloc-dev \
+      make \
+      sloccount \
+      strace \
+      swig \
+      uthash-dev \
+      xsltproc
+
diff --git a/test/docker/debian/x86_64/clang/Dockerfile b/test/docker/debian/x86_64/clang/Dockerfile
@@ -0,0 +1,6 @@
+FROM proot-me/proot:alpine-x86_64
+
+RUN apt install -y \
+      clang \
+      clang-tools-4.0
+
diff --git a/test/docker/debian/x86_64/gcc/Dockerfile b/test/docker/debian/x86_64/gcc/Dockerfile
@@ -0,0 +1,7 @@
+FROM proot-me/proot:debian-x86_64
+
+RUN apt install -y \
+      gcc \
+      gdb \
+      lcov
+
diff --git a/test/test-docker.sh b/test/test-docker.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -eu
+
+# Test can run using either builder
+BUILDER="docker"
+if [ -z "$(command -v ${BUILDER})" ]; then
+BUILDER="img"
+else
+  if [ -z "$(command -v ${BUILDER})" ]; then
+    exit 125
+  fi
+fi
+
+# Export for use in subshell
+export BUILDER
+export DOCKER_IMAGE="proot-me/proot"
+
+TMP=$(mcookie)
+TMP="/tmp/${TMP}"
+
+# Generate image list
+find . -name 'Dockerfile' -exec sh -c '
+  TAG=$(echo "${1}" | ../util/parse-docker-tag.awk)
+  echo ${BUILDER} build -t ${DOCKER_IMAGE}:${TAG} -f ${1} ..
+  ' sh {} \; | sort -k1 > "${TMP}"
+
+cat "${TMP}"
+
+# Build all images
+sh "${TMP}"
+
+rm "${TMP}"
+
+unset BUILDER
+
diff --git a/util/parse-docker-tag.awk b/util/parse-docker-tag.awk
@@ -0,0 +1,10 @@
+#!/usr/bin/awk -f
+# Convert Dockerfile path to image tag
+# input: ./docker/alpine/x86_64/gcc/Dockerfile
+# output: alpine-x86_64-gcc
+{
+  gsub(/\//,"-"); # replace / with -
+  split($0,a,"docker-"); # remove leading directories
+  split(a[2],b,"-Docker"); # remove trailing Dockerfile
+  print b[1] # print final tag
+}

-Original file line number
+Diff line change
@@ @@ -0,0 +1,7 @@ @@
 +AUTHORS
 +contrib
 +COPYING
 +doc
 +ISSUE_TEMPLATE
 +test/docker
 +*.rst