From: Daniel Karbach <daniel.karbach@localhorst.tv>
Date: Thu, 24 Nov 2016 11:40:37 +0000 (+0100)
Subject: docker image cleanup
X-Git-Url: https://git.localhorst.tv/?a=commitdiff_plain;h=ae99cb2cdafb6f59ab82e598331ce0951b32bce2;p=blank.git

docker image cleanup
---

diff --git a/scripts/docker/centos-build-latest/Dockerfile b/scripts/docker/centos-build-latest/Dockerfile
index 3331276..6e8d3cb 100644
--- a/scripts/docker/centos-build-latest/Dockerfile
+++ b/scripts/docker/centos-build-latest/Dockerfile
@@ -1,19 +1,17 @@
-FROM centos:latest
+FROM localhorsttv/centos-run:latest
 
-RUN yum -y update \
-	&& yum -y install epel-release \
-	&& yum -y update \
-	&& yum -y group install "Development Tools"
-RUN yum -y install \
-	cppcheck \
-	cppunit-devel \
-	freealut-devel \
-	glew-devel \
-	glm-devel \
-	openal-soft-devel \
-	SDL2-devel \
-	SDL2_image-devel \
-	SDL2_net-devel \
-	SDL2_ttf-devel \
-	zlib-devel \
+RUN yum -y group install "Development Tools" \
+	&& yum -y install \
+		cppcheck \
+		cppunit-devel \
+		freealut-devel \
+		glew-devel \
+		glm-devel \
+		openal-soft-devel \
+		SDL2-devel \
+		SDL2_image-devel \
+		SDL2_net-devel \
+		SDL2_ttf-devel \
+		zlib-devel \
+	&& yum -y clean packages \
 	;
diff --git a/scripts/docker/centos-run-latest/Dockerfile b/scripts/docker/centos-run-latest/Dockerfile
new file mode 100644
index 0000000..5c09e0c
--- /dev/null
+++ b/scripts/docker/centos-run-latest/Dockerfile
@@ -0,0 +1,25 @@
+FROM centos:latest
+
+RUN yum -y update \
+	&& yum -y install epel-release \
+	&& yum -y update \
+	&& yum -y install \
+		make \
+		which \
+		xorg-x11-server-utils \
+		xorg-x11-server-Xvfb \
+	&& yum -y clean packages \
+	;
+
+RUN yum -y install \
+	freealut \
+	glew \
+	openal-soft \
+	SDL2 \
+	SDL2_image \
+	SDL2_net \
+	SDL2_ttf \
+	zlib \
+	&& yum -y clean packages \
+	&& echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \
+	;
diff --git a/scripts/docker/debian-build-latest/Dockerfile b/scripts/docker/debian-build-latest/Dockerfile
index 79b8fcf..b0cccd6 100644
--- a/scripts/docker/debian-build-latest/Dockerfile
+++ b/scripts/docker/debian-build-latest/Dockerfile
@@ -1,7 +1,9 @@
-FROM debian:latest
+FROM localhorsttv/debian-run:latest
+
+RUN apt -y install build-essential \
+	&& apt-get -y clean \
+	;
 
-RUN apt update \
-	&& apt -y install build-essential
 RUN apt -y install --no-install-recommends \
 	cppcheck \
 	libalut-dev \
@@ -14,4 +16,5 @@ RUN apt -y install --no-install-recommends \
 	libsdl2-net-dev \
 	libsdl2-ttf-dev \
 	zlib1g-dev \
+	&& apt-get -y clean \
 	;
diff --git a/scripts/docker/debian-build-testing/Dockerfile b/scripts/docker/debian-build-testing/Dockerfile
index 8b422ea..b5a1eb8 100644
--- a/scripts/docker/debian-build-testing/Dockerfile
+++ b/scripts/docker/debian-build-testing/Dockerfile
@@ -1,7 +1,9 @@
-FROM debian:testing
+FROM localhorsttv/debian-run:testing
+
+RUN apt -y install build-essential \
+	&& apt-get -y clean \
+	;
 
-RUN apt update \
-	&& apt -y install build-essential
 RUN apt -y install --no-install-recommends \
 	cppcheck \
 	libalut-dev \
@@ -14,4 +16,5 @@ RUN apt -y install --no-install-recommends \
 	libsdl2-net-dev \
 	libsdl2-ttf-dev \
 	zlib1g-dev \
+	&& apt-get -y clean \
 	;
diff --git a/scripts/docker/debian-run-latest/Dockerfile b/scripts/docker/debian-run-latest/Dockerfile
new file mode 100644
index 0000000..838c84d
--- /dev/null
+++ b/scripts/docker/debian-run-latest/Dockerfile
@@ -0,0 +1,24 @@
+FROM debian:latest
+
+RUN apt -y update \
+	&& apt -y upgrade \
+	&& apt -y install --no-install-recommends \
+		make \
+		xauth \
+		xvfb \
+	&& apt-get -y clean \
+	;
+
+RUN apt -y install --no-install-recommends \
+		libalut0 \
+		libglew1.10 \
+		libglu1-mesa \
+		libopenal1 \
+		libsdl2-2.0-0 \
+		libsdl2-image-2.0-0 \
+		libsdl2-net-2.0-0 \
+		libsdl2-ttf-2.0-0 \
+		zlib1g \
+	&& apt-get -y clean \
+	&& echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \
+	;
diff --git a/scripts/docker/debian-run-testing/Dockerfile b/scripts/docker/debian-run-testing/Dockerfile
new file mode 100644
index 0000000..c344aa9
--- /dev/null
+++ b/scripts/docker/debian-run-testing/Dockerfile
@@ -0,0 +1,24 @@
+FROM debian:testing
+
+RUN apt -y update \
+	&& apt -y upgrade \
+	&& apt -y install --no-install-recommends \
+		make \
+		xauth \
+		xvfb \
+	&& apt-get -y clean \
+	;
+
+RUN apt -y install --no-install-recommends \
+	libalut0 \
+	libglew1.10 \
+	libglu1-mesa \
+	libopenal1 \
+	libsdl2-2.0-0 \
+	libsdl2-image-2.0-0 \
+	libsdl2-net-2.0-0 \
+	libsdl2-ttf-2.0-0 \
+	zlib1g \
+	&& apt-get -y clean \
+	&& echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \
+	;
diff --git a/scripts/docker/ubuntu-build-devel/Dockerfile b/scripts/docker/ubuntu-build-devel/Dockerfile
index 0415f52..15e0624 100644
--- a/scripts/docker/ubuntu-build-devel/Dockerfile
+++ b/scripts/docker/ubuntu-build-devel/Dockerfile
@@ -1,7 +1,9 @@
-FROM ubuntu:devel
+FROM localhorsttv/ubuntu-run:devel
+
+RUN apt -y install build-essential \
+	&& apt-get -y clean \
+	;
 
-RUN apt update \
-	&& apt -y install build-essential
 RUN apt -y install --no-install-recommends \
 	cppcheck \
 	libalut-dev \
@@ -14,4 +16,5 @@ RUN apt -y install --no-install-recommends \
 	libsdl2-net-dev \
 	libsdl2-ttf-dev \
 	zlib1g-dev \
+	&& apt-get -y clean \
 	;
diff --git a/scripts/docker/ubuntu-build-latest/Dockerfile b/scripts/docker/ubuntu-build-latest/Dockerfile
index 15a23de..e319fc4 100644
--- a/scripts/docker/ubuntu-build-latest/Dockerfile
+++ b/scripts/docker/ubuntu-build-latest/Dockerfile
@@ -1,7 +1,9 @@
-FROM ubuntu:latest
+FROM localhorsttv/ubuntu-run:latest
+
+RUN apt -y install build-essential \
+	&& apt-get -y clean \
+	;
 
-RUN apt update \
-	&& apt -y install build-essential
 RUN apt -y install --no-install-recommends \
 	cppcheck \
 	libalut-dev \
@@ -14,6 +16,7 @@ RUN apt -y install --no-install-recommends \
 	libsdl2-net-dev \
 	libsdl2-ttf-dev \
 	zlib1g-dev \
+	&& apt-get -y clean \
 	;
 
-ENV LDXXFLAGS=-L/usr/lib/x86_64-linux-gnu LD_LIBRARY_PATH=/usr/lib/x86_64-linux-gnu
+ENV LDXXFLAGS -L/usr/lib/x86_64-linux-gnu
diff --git a/scripts/docker/ubuntu-run-devel/Dockerfile b/scripts/docker/ubuntu-run-devel/Dockerfile
new file mode 100644
index 0000000..e5f0c01
--- /dev/null
+++ b/scripts/docker/ubuntu-run-devel/Dockerfile
@@ -0,0 +1,25 @@
+FROM ubuntu:devel
+
+RUN apt -y update \
+	&& apt -y upgrade \
+	&& apt -y install --no-install-recommends \
+		make \
+		xauth \
+		xvfb \
+	&& apt-get -y clean \
+	;
+
+
+RUN apt -y install --no-install-recommends make \
+	libalut0 \
+	libglew1.10 \
+	libglu1-mesa \
+	libopenal1 \
+	libsdl2-2.0-0 \
+	libsdl2-image-2.0-0 \
+	libsdl2-net-2.0-0 \
+	libsdl2-ttf-2.0-0 \
+	zlib1g \
+	&& apt-get -y clean \
+	&& echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \
+	;
diff --git a/scripts/docker/ubuntu-run-latest/Dockerfile b/scripts/docker/ubuntu-run-latest/Dockerfile
new file mode 100644
index 0000000..69c11a9
--- /dev/null
+++ b/scripts/docker/ubuntu-run-latest/Dockerfile
@@ -0,0 +1,26 @@
+FROM ubuntu:latest
+
+RUN apt update \
+	&& apt -y upgrade \
+	&& apt -y install --no-install-recommends \
+		make \
+		xauth \
+		xvfb \
+	&& apt-get -y clean \
+	;
+
+RUN apt -y install --no-install-recommends \
+		libalut0 \
+		libglew1.10 \
+		libglu1-mesa \
+		libopenal1 \
+		libsdl2-2.0-0 \
+		libsdl2-image-2.0-0 \
+		libsdl2-net-2.0-0 \
+		libsdl2-ttf-2.0-0 \
+		zlib1g \
+	&& apt-get -y clean \
+	&& echo -e '[general]\ndrivers = null' > /etc/openal/alsoft.conf \
+	;
+
+ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu