mirror of
https://github.com/falk-werner/webfuse
synced 2024-10-27 20:34:10 +00:00
replaces arm32v7-debian by arm32v7-alpine image
This commit is contained in:
parent
9c7fe85312
commit
8ede6595d9
8
Makefile
8
Makefile
@ -36,7 +36,6 @@ CONTAINER_USER ?= user
|
|||||||
CONTAINER_GROUP ?= user
|
CONTAINER_GROUP ?= user
|
||||||
|
|
||||||
UBUNTU_CODENAME ?= bionic
|
UBUNTU_CODENAME ?= bionic
|
||||||
DEBIAN_CODENAME ?= testing-slim
|
|
||||||
ALPINE_CODENAME ?= 3.9
|
ALPINE_CODENAME ?= 3.9
|
||||||
|
|
||||||
SKIP_MD5SUM ?= $(call filter_out_command,md5sum)
|
SKIP_MD5SUM ?= $(call filter_out_command,md5sum)
|
||||||
@ -87,16 +86,13 @@ $(SKIP_MD5SUM)$(FETCHDIR)/qemu-arm-static-$(QEMU_VERSION): MD5 := 8ebd24e63fdfa0
|
|||||||
CMAKE_TARGETS += amd64-ubuntu-builder
|
CMAKE_TARGETS += amd64-ubuntu-builder
|
||||||
CMAKE_TARGETS += amd64-alpine-builder
|
CMAKE_TARGETS += amd64-alpine-builder
|
||||||
CMAKE_TARGETS += arm32v7-ubuntu-builder
|
CMAKE_TARGETS += arm32v7-ubuntu-builder
|
||||||
CMAKE_TARGETS += arm32v7-debian-builder
|
CMAKE_TARGETS += arm32v7-alpine-builder
|
||||||
|
|
||||||
MEMCHECK_FILTER = $(call regex_march_distro,'$(HOST_MARCH)','.*')
|
MEMCHECK_FILTER = $(call regex_march_distro,'$(HOST_MARCH)','.*')
|
||||||
|
|
||||||
UBUNTU_FILTER = $(call regex_march_distro,'.*','ubuntu')
|
UBUNTU_FILTER = $(call regex_march_distro,'.*','ubuntu')
|
||||||
UBUNTU_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(UBUNTU_FILTER),$(TARGETS)))
|
UBUNTU_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(UBUNTU_FILTER),$(TARGETS)))
|
||||||
|
|
||||||
DEBIAN_FILTER = $(call regex_march_distro,'.*','debian')
|
|
||||||
DEBIAN_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(DEBIAN_FILTER),$(TARGETS)))
|
|
||||||
|
|
||||||
ALPINE_FILTER = $(call regex_march_distro,'.*','alpine')
|
ALPINE_FILTER = $(call regex_march_distro,'.*','alpine')
|
||||||
ALPINE_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(ALPINE_FILTER),$(TARGETS)))
|
ALPINE_TARGETS = $(addprefix $(OUTDIR)/docker/,$(call filter_targets,$(ALPINE_FILTER),$(TARGETS)))
|
||||||
|
|
||||||
@ -142,8 +138,6 @@ $(CHECK_TARGETS): GOALS := test
|
|||||||
|
|
||||||
$(UBUNTU_TARGETS): CODENAME := $(UBUNTU_CODENAME)
|
$(UBUNTU_TARGETS): CODENAME := $(UBUNTU_CODENAME)
|
||||||
|
|
||||||
$(DEBIAN_TARGETS): CODENAME := $(DEBIAN_CODENAME)
|
|
||||||
|
|
||||||
$(ALPINE_TARGETS): CODENAME := $(ALPINE_CODENAME)
|
$(ALPINE_TARGETS): CODENAME := $(ALPINE_CODENAME)
|
||||||
|
|
||||||
$(FETCH_TARGETS): | $(FETCHDIR)
|
$(FETCH_TARGETS): | $(FETCHDIR)
|
||||||
|
@ -1,23 +1,27 @@
|
|||||||
ARG REGISTRY_PREFIX=''
|
ARG REGISTRY_PREFIX=''
|
||||||
ARG CODENAME=testing-slim
|
ARG CODENAME=3.9
|
||||||
|
|
||||||
FROM ${REGISTRY_PREFIX}arm32v7/debian:${CODENAME} as builder
|
FROM ${REGISTRY_PREFIX}arm32v7/alpine:${CODENAME} as builder
|
||||||
|
|
||||||
ARG QEMU_VERSION_=v3.1.0-2
|
ARG QEMU_VERSION_=v3.1.0-2
|
||||||
|
|
||||||
COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static
|
COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& apt update \
|
&& apk add --no-cache \
|
||||||
&& apt upgrade -y \
|
bash \
|
||||||
&& apt install --yes --no-install-recommends \
|
coreutils \
|
||||||
build-essential \
|
gcc \
|
||||||
|
g++ \
|
||||||
|
make \
|
||||||
cmake \
|
cmake \
|
||||||
ninja-build \
|
ninja \
|
||||||
pkg-config \
|
pkgconf \
|
||||||
rsync \
|
rsync \
|
||||||
gdb \
|
gdb \
|
||||||
gdbserver
|
valgrind \
|
||||||
|
util-linux \
|
||||||
|
util-linux-dev
|
||||||
|
|
||||||
COPY src /usr/local/src
|
COPY src /usr/local/src
|
||||||
|
|
||||||
@ -26,8 +30,8 @@ ARG PARALLELMFLAGS=-j2
|
|||||||
ARG DUMB_INIT_VERSION=1.2.2
|
ARG DUMB_INIT_VERSION=1.2.2
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& builddeps="xxd" \
|
&& builddeps="vim" \
|
||||||
&& apt install --yes --no-install-recommends $builddeps \
|
&& apk add --no-cache --virtual .build-deps $builddeps \
|
||||||
&& builddir="/tmp/out" \
|
&& builddir="/tmp/out" \
|
||||||
&& mkdir -p "$builddir" \
|
&& mkdir -p "$builddir" \
|
||||||
&& cd "$builddir" \
|
&& cd "$builddir" \
|
||||||
@ -38,7 +42,7 @@ RUN set -x \
|
|||||||
&& mv dumb-init /usr/local/bin/dumb-init \
|
&& mv dumb-init /usr/local/bin/dumb-init \
|
||||||
&& dumb-init --version \
|
&& dumb-init --version \
|
||||||
&& rm -rf "$builddir" \
|
&& rm -rf "$builddir" \
|
||||||
&& apt purge -y $builddeps
|
&& apk del .build-deps
|
||||||
|
|
||||||
ARG GTEST_VERSION=1.8.1
|
ARG GTEST_VERSION=1.8.1
|
||||||
|
|
||||||
@ -53,8 +57,8 @@ RUN set -x \
|
|||||||
ARG FUSE_VERSION=3.1.1
|
ARG FUSE_VERSION=3.1.1
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& builddeps="libtool automake gettext" \
|
&& builddeps="libtool automake autoconf gettext-dev m4 linux-headers" \
|
||||||
&& apt install --yes --no-install-recommends $builddeps \
|
&& apk add --no-cache --virtual .build-deps $builddeps \
|
||||||
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
|
&& cd "/usr/local/src/libfuse-fuse-$FUSE_VERSION" \
|
||||||
&& ./makeconf.sh \
|
&& ./makeconf.sh \
|
||||||
&& builddir="/tmp/out" \
|
&& builddir="/tmp/out" \
|
||||||
@ -63,15 +67,15 @@ RUN set -x \
|
|||||||
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \
|
&& "/usr/local/src/libfuse-fuse-$FUSE_VERSION/configure" \
|
||||||
&& make "$PARALLELMFLAGS" install \
|
&& make "$PARALLELMFLAGS" install \
|
||||||
&& rm -rf "$builddir" \
|
&& rm -rf "$builddir" \
|
||||||
&& apt purge -y $builddeps
|
&& apk del .build-deps
|
||||||
|
|
||||||
ARG WEBSOCKETS_VERSION=3.1.0
|
ARG WEBSOCKETS_VERSION=3.1.0
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& apt install --yes --no-install-recommends \
|
&& apk add --no-cache \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
openssl \
|
openssl \
|
||||||
libssl-dev \
|
openssl-dev \
|
||||||
&& builddir="/tmp/out" \
|
&& builddir="/tmp/out" \
|
||||||
&& mkdir -p "$builddir" \
|
&& mkdir -p "$builddir" \
|
||||||
&& cd "$builddir" \
|
&& cd "$builddir" \
|
||||||
@ -90,6 +94,7 @@ RUN set -x \
|
|||||||
&& rm -rf "$builddir"
|
&& rm -rf "$builddir"
|
||||||
|
|
||||||
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/lib"
|
||||||
|
ENV PKG_CONFIG_PATH=/usr/local/lib32/pkgconfig
|
||||||
|
|
||||||
ARG USERID=1000
|
ARG USERID=1000
|
||||||
|
|
||||||
@ -98,7 +103,7 @@ ARG OUTDIR=/workspace/out
|
|||||||
ARG SCRIPTDIR=/workspace/bin
|
ARG SCRIPTDIR=/workspace/bin
|
||||||
|
|
||||||
RUN set -x \
|
RUN set -x \
|
||||||
&& useradd -u "$USERID" -ms /bin/bash user \
|
&& adduser -u "$USERID" -s /bin/bash -D user \
|
||||||
&& mkdir -p "$PROJECTDIR" "$OUTDIR" "$SCRIPTDIR" \
|
&& mkdir -p "$PROJECTDIR" "$OUTDIR" "$SCRIPTDIR" \
|
||||||
&& chown user:user "$PROJECTDIR" "$OUTDIR" "$SCRIPTDIR"
|
&& chown user:user "$PROJECTDIR" "$OUTDIR" "$SCRIPTDIR"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user