Browse Source

fix

tags/v0.0.59
Peter Vivell 6 years ago
parent
commit
6d2df9431a
2 changed files with 9 additions and 4 deletions
  1. 8
    3
      Dockerfile
  2. 1
    1
      drone.yml

+ 8
- 3
Dockerfile View File

34
 ARG BUILD_DEPS
34
 ARG BUILD_DEPS
35
 ARG BUILD_ARCH
35
 ARG BUILD_ARCH
36
 RUN export DEBIAN_FRONTEND=noninteractive && \
36
 RUN export DEBIAN_FRONTEND=noninteractive && \
37
-    for ARCH in ${BUILD_ARCH} ; do dpkg --add-architecture ${ARCH} ; done && \
37
+    for ARCH in ${BUILD_ARCH} ; do \
38
+      dpkg --add-architecture ${ARCH} ; \
39
+    done && \
38
     apt-get -q  update && \
40
     apt-get -q  update && \
39
     apt-get -qy -o Dpkg::Use-Pty=0 upgrade && \
41
     apt-get -qy -o Dpkg::Use-Pty=0 upgrade && \
40
     apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends apt-utils && \
42
     apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends apt-utils && \
41
     apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends ${BUILD_DEPS} \
43
     apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends ${BUILD_DEPS} \
42
-        build-essential debhelper ca-certificates curl git iproute2 wget nano && \
43
-    for ARCH in ${BUILD_ARCH} ; do apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends crossbuild-essential-${ARCH} ; done && \
44
+        apt-utils build-essential debhelper ca-certificates curl git iproute2 wget nano && \
45
+    for ARCH in ${BUILD_ARCH} ; do \
46
+      apt-get -qy -o Dpkg::Use-Pty=0 install --no-install-recommends \
47
+        crossbuild-essential-${ARCH} $(printf "%s:${ARCH} " ${BUILD_DEPS}) ; \
48
+    done && \
44
     apt-get clean && rm -rf /var/lib/apt/lists/*
49
     apt-get clean && rm -rf /var/lib/apt/lists/*
45
 
50
 
46
 # Default command
51
 # Default command

+ 1
- 1
drone.yml View File

40
     tags: [ latest, builder ]
40
     tags: [ latest, builder ]
41
     build_args: # custom args for docker build, e.g. additional BUILD_DEPS etc.
41
     build_args: # custom args for docker build, e.g. additional BUILD_DEPS etc.
42
       - DEB_RELEASE=stretch
42
       - DEB_RELEASE=stretch
43
-      - BUILD_DEPS=libhidapi-dev libssl-dev zip
43
+      - BUILD_DEPS=libhidapi-dev libssl-dev
44
       - BUILD_ARCH=i386 amd64 armhf armel # amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x
44
       - BUILD_ARCH=i386 amd64 armhf armel # amd64 arm64 armel armhf i386 mips mips64el mipsel powerpc ppc64el s390x
45
 
45
 
46
 
46
 

Loading…
Cancel
Save