Prepare for automatic builds

WDCommunity · Aug 30, 2020 · 28f785f · 28f785f
1 parent 46c327a
commit 28f785f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,12 +1,12 @@
-FROM ubuntu:16.04
+FROM debian:buster
 LABEL maintainer="WDCommunity <https://github.com/wdcommunity>"
 
 ENV LANG C.UTF-8
 
-# Manage i386 arch
-RUN dpkg --add-architecture i386; \
-    apt-get update; \
-    apt-get install openssl libxml2:i386 -y
+RUN apt-get update; \
+    apt-get install openssl libxml2 -y
+
+COPY mksapkg /usr/bin
 
 # Volume pointing to spksrc sources
 VOLUME /wdpksrc

diff --git a/build_and_install.sh b/build_and_install.sh
@@ -35,7 +35,7 @@ fi
 # TODO: check if this docker image exists
 
 # create packages
-docker run -it -v $(pwd):/wdpksrc wdpk /bin/bash -c "cd wdpk/$PACKAGE; ./build.sh; chown -R 1000:1000 ../../packages/$PACKAGE"
+docker run -it -v $(pwd):/wdpksrc wdpk/wdpk /bin/bash -c "cd wdpk/$PACKAGE; ./build.sh; chown -R 1000:1000 ../../packages/$PACKAGE"
 
 # find latest package
 MODEL="$3"

diff --git a/mksapkg b/mksapkg