Refactor build to use Makefile

Author: jamesbrink

.dockerignore

@@ -1,7 +1,8 @@
 .git
 .gitignore
 .travis.yml
-README.md
-LICENSE
-hooks
 Dockerfile
+hooks
+LICENSE
+README.md
+temp

.gitignore

@@ -0,0 +1 @@
+temp

Dockerfile

@@ -1,67 +1,96 @@
 # Mesa3D Software Drivers
-#
-# VERSION 18.0.1
 
-FROM alpine:3.7
+FROM alpine:3.10 as builder
 
-# Build arguments.
-ARG VCS_REF
-ARG BUILD_DATE
-ARG MESA_DEMOS="false"
-
-# Labels / Metadata.
-LABEL maintainer="James Brink, [email protected]" \
-      decription="Mesa3D Software Drivers" \
-      version="18.0.1" \
-      org.label-schema.name="Mesa3D-Software-Drivers" \
-      org.label-schema.build-date=$BUILD_DATE \
-      org.label-schema.vcs-ref=$VCS_REF \
-      org.label-schema.vcs-url="https://github.com/jamesbrink/docker-gource" \
-      org.label-schema.schema-version="1.0.0-rc1"
+# Install all needed build deps for Mesa
+RUN set -xe; \
+    apk add --no-cache --virtual .build-deps \
+        autoconf \
+        automake \
+        bison \
+        build-base \
+        expat-dev \
+        flex \
+        gettext \
+        git \
+        glproto \
+        libtool \
+        llvm7 \
+        llvm7-dev \
+        py-mako \
+        xorg-server-dev python-dev \
+        zlib-dev;
 
-# Install all needed deps and compile the mesa llvmpipe driver from source.
+# Clone Mesa source repo. (this step caches)
+# Due to ongoing packaging issues we build from git vs tar packages
+# Refer to https://bugs.freedesktop.org/show_bug.cgi?id=107865 
 RUN set -xe; \
-    apk --update add --no-cache --virtual .runtime-deps xvfb llvm5-libs xdpyinfo; \
-    apk add --no-cache --virtual .build-deps llvm-dev build-base zlib-dev glproto xorg-server-dev python-dev; \
     mkdir -p /var/tmp/build; \
     cd /var/tmp/build; \
-    wget "https://mesa.freedesktop.org/archive/mesa-18.0.1.tar.gz"; \
-    tar xfv mesa-18.0.1.tar.gz; \
-    rm mesa-18.0.1.tar.gz; \
-    cd mesa-18.0.1; \
-    ./configure --enable-glx=gallium-xlib --with-gallium-drivers=swrast,swr --disable-dri --disable-gbm --disable-egl --enable-gallium-osmesa --prefix=/usr/local; \
-    make; \
-    make install; \
-    cd .. ; \
-    rm -rf mesa-18.0.1; \
-    if [ "${MESA_DEMOS}" == "true" ]; then \
-        apk add --no-cache --virtual .mesa-demos-runtime-deps glu glew \
-        && apk add --no-cache --virtual .mesa-demos-build-deps glew-dev freeglut-dev \
-        && wget "ftp://ftp.freedesktop.org/pub/mesa/demos/mesa-demos-8.4.0.tar.gz" \
-        && tar xfv mesa-demos-8.4.0.tar.gz \
-        && rm mesa-demos-8.4.0.tar.gz \
-        && cd mesa-demos-8.4.0 \
-        && ./configure --prefix=/usr/local \
-        && make \
-        && make install \
-        && cd .. \
-        && rm -rf mesa-demos-8.4.0 \
-        && apk del .mesa-demos-build-deps; \
-    fi; \
-    apk del .build-deps;
+    git clone https://gitlab.freedesktop.org/mesa/mesa.git;
+
+# Build Mesa from source.
+ARG MESA_VERSION
+RUN set -xe; \
+    cd /var/tmp/build/mesa; \
+    git checkout mesa-${MESA_VERSION}; \
+    libtoolize; \
+    autoreconf --install; \
+    ./configure \
+        --enable-glx=gallium-xlib \
+        --with-gallium-drivers=swrast,swr \
+        --disable-dri \
+        --disable-gbm \
+        --disable-egl \
+        --enable-gallium-osmesa \
+        --enable-autotools \
+        --enable-llvm \
+        --with-llvm-prefix=/usr/lib/llvm7/ \
+        --prefix=/usr/local; \
+    make -j$(getconf _NPROCESSORS_ONLN); \
+    make install;
 
 # Copy our entrypoint into the container.
 COPY ./entrypoint.sh /usr/local/bin/entrypoint.sh
 
+# Create fresh image from alpine
+FROM alpine:3.10
+
+# Install runtime dependencies for Mesa
+RUN set -xe; \
+    apk --update add --no-cache --virtual .runtime-deps \
+        expat \
+        llvm7-libs \
+        xdpyinfo \
+        xvfb;
+
+# Copy the Mesa build & entrypoint script from previous stage
+COPY --from=builder /usr/local /usr/local
+
+# Labels / Metadata.
+ARG VCS_REF
+ARG BUILD_DATE
+ARG MESA_DEMOS
+ARG MESA_VERSION
+LABEL maintainer="James Brink, [email protected]" \
+      org.label-schema.decription="Mesa3D Software Drivers" \
+      org.label-schema.version="${MESA_VERSION}" \
+      org.label-schema.name="Mesa3D-Software-Drivers" \
+      org.label-schema.build-date="${BUILD_DATE}" \
+      org.label-schema.vcs-ref="${VCS_REF}" \
+      org.label-schema.vcs-url="https://github.com/utensils/docker-opengl" \
+      org.label-schema.schema-version="1.0.0-rc1"
+
 # Setup our environment variables.
-ENV XVFB_WHD="1920x1080x24"\
-    DISPLAY=":99" \
-    LIBGL_ALWAYS_SOFTWARE="1" \
+ENV DISPLAY=":99" \
     GALLIUM_DRIVER="llvmpipe" \
-    LP_NO_RAST="false" \
+    LIBGL_ALWAYS_SOFTWARE="1" \
     LP_DEBUG="" \
+    LP_NO_RAST="false" \
+    LP_NUM_THREADS="" \
     LP_PERF="" \
-    LP_NUM_THREADS=""
+    MESA_VERSION="${MESA_VERSION}" \
+    XVFB_WHD="1920x1080x24"
 
 # Set the default command.
 ENTRYPOINT ["/usr/local/bin/entrypoint.sh"]

Makefile

@@ -0,0 +1,43 @@
+# !/usr/bin/make - f
+
+SHELL                   := /usr/bin/env bash
+DOCKER_NAMESPACE        ?= jamesbrink
+IMAGE_NAME              ?= opengl
+VERSION                 := $(shell git describe --tags --abbrev=0 2>/dev/null || git rev-parse --abbrev-ref HEAD)
+VCS_REF                 := $(shell git rev-parse --short HEAD)
+BUILD_DATE              := $(shell date -u +"%Y-%m-%dT%H:%M:%SZ")
+ARCH                    := $(shell uname -m)
+RELEASES                := 18.2.8 18.3.6 19.0.8
+LATEST_TAG              := 19.0.8
+STABLE_TAG              := 19.0.8
+
+# Default target is to build all defined Mesa releases.
+.PHONY: default
+default: 19.0.8 tag-latest
+
+.PHONY: all tag-latest
+all: $(RELEASES)
+
+# Build base images for all releases.
+.PHONY: $(RELEASES)
+$(RELEASES):
+	docker build \
+		--build-arg BUILD_DATE=$(BUILD_DATE) \
+		--build-arg VCS_REF=$(VCS_REF) \
+		--build-arg MESA_VERSION=$(@) \
+		--tag $(DOCKER_NAMESPACE)/$(IMAGE_NAME):$(@) \
+		--tag $(DOCKER_NAMESPACE)/$(IMAGE_NAME):$(@)-$(VCS_REF) \
+		--tag $(DOCKER_NAMESPACE)/$(IMAGE_NAME):$(@)-$(VERSION) \
+		--file Dockerfile .; \
+
+# Tag our latest release
+.PHONY: tag-latest
+tag-latest:
+	docker tag $(DOCKER_NAMESPACE)/$(IMAGE_NAME):$(LATEST_TAG) $(DOCKER_NAMESPACE)/$(IMAGE_NAME):latest
+
+# Tag our stable release
+.PHONY: tag-stable
+tag-stable:
+	docker tag $(DOCKER_NAMESPACE)/$(IMAGE_NAME):$(STABLE_TAG) $(DOCKER_NAMESPACE)/$(IMAGE_NAME):stable
+	
+

README.md

@@ -10,10 +10,10 @@ Minimal Docker container bundled with the Mesa 3D Gallium Drivers: [LLVMpipe][me
 
 ## Features
 
-* Alpine Linux 3.7
-* LLVMpipe Driver (Mesa 18.0.1)
-* OpenSWR Driver (Mesa 18.0.1)
-* OSMesa Interface (Mesa 18.0.1)
+* Alpine Linux 3.10
+* LLVMpipe Driver (Mesa 19.0.8)
+* OpenSWR Driver (Mesa 19.0.8)
+* OSMesa Interface (Mesa 19.0.8)
 * softpipe - Reference Gallium software driver
 * swrast - Legacy Mesa software rasterizer
 * Xvfb - X Virtual Frame Buffer
@@ -25,14 +25,24 @@ Minimal Docker container bundled with the Mesa 3D Gallium Drivers: [LLVMpipe][me
 | `jamesbrink/opengl`       | Minimal image, good to extend `FROM`                                    |
 | `jamesbrink/opengl:demos` | Same image with added mesa3d demos such as `glxinfo`, `glxgears`, etc.. |
 
+
+## Building
+
+This image can be built using the supplied Makefile
+
+```shell
+make
+```
+
+
 ## Usage
 
 I build this image primarily to extnend from for other projects, but below are some simple examples. This image is already loaded with a trivial entrypoint script.  
 
 Extending from this image. 
 
 ```Dockerfile
-FROM jamesbrink/opengl:18.0.1
+FROM jamesbrink/opengl:19.0.8
 COPY ./MyAppOpenGLApp /AnywhereMyHeartDesires
 RUN apk add --update my-deps...
 ```