mirror of
https://github.com/falk-werner/webfuse
synced 2024-10-27 20:34:10 +00:00
fixes copy artifacts to image
This commit is contained in:
parent
dee7ee7d7e
commit
2bd6b2fd42
11
Makefile
11
Makefile
@ -60,11 +60,11 @@ DISABLE_MD5SUM := $(DISABLE_MD5SUM)
|
||||
|
||||
# Project dependencies
|
||||
|
||||
DUMB_INIT_VERISON ?= 1.2.2
|
||||
DOCKER_BUILDARGS += DUMB_INIT_VERISON=$(DUMB_INIT_VERISON)
|
||||
FETCH_TARGETS += $(OUT)/dumb-init-$(DUMB_INIT_VERISON).tar.gz
|
||||
$(OUT)/dumb-init-$(DUMB_INIT_VERISON).tar.gz: URL := https://github.com/Yelp/dumb-init/archive/v${DUMB_INIT_VERISON}.tar.gz
|
||||
$(DISABLE_MD5SUM)$(OUT)/dumb-init-$(DUMB_INIT_VERISON).tar.gz: MD5 := 6166084b05772cdcf615a762c6f3b32e
|
||||
DUMB_INIT_VERSION ?= 1.2.2
|
||||
DOCKER_BUILDARGS += DUMB_INIT_VERSION=$(DUMB_INIT_VERSION)
|
||||
FETCH_TARGETS += $(OUT)/dumb-init-$(DUMB_INIT_VERSION).tar.gz
|
||||
$(OUT)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: URL := https://github.com/Yelp/dumb-init/archive/v${DUMB_INIT_VERSION}.tar.gz
|
||||
$(DISABLE_MD5SUM)$(OUT)/dumb-init-$(DUMB_INIT_VERSION).tar.gz: MD5 := 6166084b05772cdcf615a762c6f3b32e
|
||||
|
||||
GTEST_VERSION ?= 1.8.1
|
||||
DOCKER_BUILDARGS += GTEST_VERSION=$(GTEST_VERSION)
|
||||
@ -91,6 +91,7 @@ $(OUT)/jansson-$(JANSSON_VERSION).tar.gz: URL := https://github.com/akheron/jans
|
||||
$(DISABLE_MD5SUM)$(OUT)/jansson-$(JANSSON_VERSION).tar.gz: MD5 := c4b106528d5ffb521178565de1ba950d
|
||||
|
||||
QEMU_VERSION ?= v3.1.0-2
|
||||
DOCKER_BUILDARGS += QEMU_VERSION_=$(QEMU_VERSION)
|
||||
FETCH_TARGETS += $(OUT)/docker/qemu-arm-static-$(QEMU_VERSION)
|
||||
$(OUT)/docker/qemu-arm-static-$(QEMU_VERSION): URL := https://github.com/multiarch/qemu-user-static/releases/download/$(QEMU_VERSION)/qemu-arm-static
|
||||
$(DISABLE_MD5SUM)$(OUT)/docker/qemu-arm-static-$(QEMU_VERSION): MD5 := 8ebd24e63fdfa07c557d45373bd831b1
|
||||
|
@ -19,7 +19,7 @@ COPY src /usr/local/src
|
||||
|
||||
ARG PARALLELMFLAGS=-j2
|
||||
|
||||
ARG DUMB_INIT_VERISON=1.2.2
|
||||
ARG DUMB_INIT_VERSION=1.2.2
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="xxd" \
|
||||
@ -28,7 +28,7 @@ RUN set -x \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cp -R "/usr/local/src/dumb-init-$DUMB_INIT_VERISON" . \
|
||||
&& cd dumb-init-$DUMB_INIT_VERISON \
|
||||
&& cd "dumb-init-$DUMB_INIT_VERSION" \
|
||||
&& make "$PARALLELMFLAGS" \
|
||||
&& chmod +x dumb-init \
|
||||
&& mv dumb-init /usr/local/bin/dumb-init \
|
||||
|
@ -19,7 +19,7 @@ COPY src /usr/local/src
|
||||
|
||||
ARG PARALLELMFLAGS=-j2
|
||||
|
||||
ARG DUMB_INIT_VERISON=1.2.2
|
||||
ARG DUMB_INIT_VERSION=1.2.2
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="xxd" \
|
||||
@ -28,7 +28,7 @@ RUN set -x \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cp -R "/usr/local/src/dumb-init-$DUMB_INIT_VERISON" . \
|
||||
&& cd dumb-init-$DUMB_INIT_VERISON \
|
||||
&& cd "dumb-init-$DUMB_INIT_VERSION" \
|
||||
&& make "$PARALLELMFLAGS" \
|
||||
&& chmod +x dumb-init \
|
||||
&& mv dumb-init /usr/local/bin/dumb-init \
|
||||
|
@ -2,7 +2,9 @@ ARG CODENAME=testing-slim
|
||||
|
||||
FROM arm32v7/debian:$CODENAME as builder
|
||||
|
||||
COPY docker/qemu-arm-static-* /usr/bin/qemu-arm-static
|
||||
ARG QEMU_VERSION_=v3.1.0-2
|
||||
|
||||
COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static
|
||||
|
||||
RUN set -x \
|
||||
&& apt update \
|
||||
@ -20,7 +22,7 @@ COPY src /usr/local/src
|
||||
|
||||
ARG PARALLELMFLAGS=-j2
|
||||
|
||||
ARG DUMB_INIT_VERISON=1.2.2
|
||||
ARG DUMB_INIT_VERSION=1.2.2
|
||||
|
||||
RUN set -x \
|
||||
&& builddeps="xxd" \
|
||||
@ -29,7 +31,7 @@ RUN set -x \
|
||||
&& mkdir -p "$builddir" \
|
||||
&& cd "$builddir" \
|
||||
&& cp -R "/usr/local/src/dumb-init-$DUMB_INIT_VERISON" . \
|
||||
&& cd dumb-init-$DUMB_INIT_VERISON \
|
||||
&& cd "dumb-init-$DUMB_INIT_VERSION" \
|
||||
&& make "$PARALLELMFLAGS" \
|
||||
&& chmod +x dumb-init \
|
||||
&& mv dumb-init /usr/local/bin/dumb-init \
|
||||
|
@ -2,7 +2,9 @@ ARG CODENAME=bionic
|
||||
|
||||
FROM arm32v7/ubuntu:$CODENAME as builder
|
||||
|
||||
COPY docker/qemu-arm-static-* /usr/bin/qemu-arm-static
|
||||
ARG QEMU_VERSION_=v3.1.0-2
|
||||
|
||||
COPY docker/qemu-arm-static-$QEMU_VERSION_ /usr/bin/qemu-arm-static
|
||||
|
||||
RUN set -x \
|
||||
&& apt update \
|
||||
|
Loading…
Reference in New Issue
Block a user