Archives/falk-werner_webfuse-provider
1
0
Fork 0
mirror of https://github.com/falk-werner/webfuse-provider synced 2026-03-02 04:09:18 +00:00
Code Issues Releases Wiki Activity

refactors docker build

Browse Source 
fixes issue when upgrading dependency versions
makes container workspace configurable
This commit is contained in:
nosamad
2019-03-23 02:17:44 +01:00
parent 740b247250
commit 6d7f38baa0
3 changed files with 117 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
docker/wsfs-builder-amd64-ubuntu.dockerfile → docker/amd64-ubuntu-builder.dockerfile
View File

@@ -16,28 +16,34 @@ COPY src /usr/local/src
ARG PARALLELMFLAGS=-j2
ARG GTEST_VERSION=1.8.1
RUN set -x \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake /usr/local/src/googletest-release-* \
&& make $PARALLELMFLAGS install \
&& cmake "/usr/local/src/googletest-release-$GTEST_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out
ARG FUSE_VERSION=3.1.1
RUN set -x \
&& apt update \
&& apt install --yes --no-install-recommends \
libtool \
automake \
gettext \
&& cd /usr/local/src/libfuse-fuse-* \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& /usr/local/src/libfuse-fuse-*/configure \
&& make $PARALLELMFLAGS install \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out \
&& rm -rf /var/lib/apt/lists/*
ARG WEBSOCKETS_VERSION=3.1.0
RUN set -x \
&& apt update \
&& apt install --yes --no-install-recommends \
@@ -45,22 +51,30 @@ RUN set -x \
libssl-dev \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake /usr/local/src/libwebsockets-* \
&& make $PARALLELMFLAGS install \
&& cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out \
&& rm -rf /var/lib/apt/lists/*
ARG JANSSON_VERSION=2.12
RUN set -x \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake -DJANSSON_BUILD_DOCS=OFF /usr/local/src/jansson-* \
&& make $PARALLELMFLAGS install \
&& cmake -DJANSSON_BUILD_DOCS=OFF "/usr/local/src/jansson-$JANSSON_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
ARG USERID=1000
RUN useradd -u $USERID -ms /bin/bash user
ARG WORKSPACE=/workspace
RUN set -x \
&& useradd -u "$USERID" -ms /bin/bash user \
&& mkdir -p "$WORKSPACE" \
&& chown user:user "$WORKSPACE"
WORKDIR "$WORKSPACE"

36
docker/wsfs-builder-arm32v7-ubuntu.dockerfile → docker/arm32v7-ubuntu-builder.dockerfile
View File

@@ -18,28 +18,34 @@ COPY src /usr/local/src
ARG PARALLELMFLAGS=-j2
ARG GTEST_VERSION=1.8.1
RUN set -x \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake /usr/local/src/googletest-release-* \
&& make $PARALLELMFLAGS install \
&& cmake "/usr/local/src/googletest-release-$GTEST_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out
ARG FUSE_VERSION=3.1.1
RUN set -x \
&& apt update \
&& apt install --yes --no-install-recommends \
libtool \
automake \
gettext \
&& cd /usr/local/src/libfuse-fuse-* \
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
&& ./makeconf.sh \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& /usr/local/src/libfuse-fuse-*/configure \
&& make $PARALLELMFLAGS install \
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out \
&& rm -rf /var/lib/apt/lists/*
ARG WEBSOCKETS_VERSION=3.1.0
RUN set -x \
&& apt update \
&& apt install --yes --no-install-recommends \
@@ -47,22 +53,30 @@ RUN set -x \
libssl-dev \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake /usr/local/src/libwebsockets-* \
&& make $PARALLELMFLAGS install \
&& cmake "/usr/local/src/libwebsockets-$WEBSOCKETS_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out \
&& rm -rf /var/lib/apt/lists/*
ARG JANSSON_VERSION=2.12
RUN set -x \
&& mkdir -p /tmp/out \
&& cd /tmp/out \
&& cmake -DJANSSON_BUILD_DOCS=OFF /usr/local/src/jansson-* \
&& make $PARALLELMFLAGS install \
&& cmake -DJANSSON_BUILD_DOCS=OFF "/usr/local/src/jansson-$JANSSON_VERSION" \
&& make "$PARALLELMFLAGS" install \
&& rm -rf /tmp/out
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
ARG USERID=1000
RUN useradd -u $USERID -ms /bin/bash user
ARG WORKSPACE=/workspace
RUN set -x \
&& useradd -u "$USERID" -ms /bin/bash user \
&& mkdir -p "$WORKSPACE" \
&& chown user:user "$WORKSPACE"
WORKDIR "$WORKSPACE"