diff --git a/debuild/Dockerfile b/debuild/Dockerfile index 0cd0b8c..b323eaf 100644 --- a/debuild/Dockerfile +++ b/debuild/Dockerfile @@ -6,8 +6,7 @@ RUN apt-get update \ && apt-get install -y \ build-essential \ debhelper \ - devscripts \ - sudo + devscripts RUN apt-get update \ && apt-get install -y --no-install-recommends \ @@ -20,9 +19,10 @@ RUN apt-get update \ nodejs \ && npm install -g npm +RUN rm -rf /var/lib/apt/lists/* + RUN groupadd -g 1000 jenkins \ && useradd -d /home/jenkins -u 1000 -g 1000 -m -s /bin/bash jenkins \ - && echo "jenkins ALL=(ALL) NOPASSWD: ALL" > /etc/sudoers.d/jenkins \ && mkdir -p /home/jenkins/agent/workspace \ && chown -R jenkins:jenkins /home/jenkins/agent diff --git a/debuild/vn-includedeb b/debuild/vn-includedeb deleted file mode 100755 index 4cb09bf..0000000 --- a/debuild/vn-includedeb +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -set -e - -srcDir=. - -if [ ! -f "$srcDir/debian/changelog" ]; then - echo "Invalid source directory." - exit 1 -fi - -codename=$1 -buildDir="$srcDir/.." - -if [ -z "$codename" ]; then - codename="stable" -fi - -cut -d" " -f1 "$srcDir/debian/files" | -while read debFile; do - if [[ ! "$debFile" =~ .*\.deb$ ]]; then - continue - fi - - echo "Adding $debFile" - cp "$buildDir/$debFile" /tmp - sudo -u www-data reprepro -b /reprepro --gnupghome /reprepro/.gnupg \ - includedeb $codename "/tmp/$debFile" -done - -echo "Cleaning." -(cd "$srcDir" && debian/rules clean) -rm -f $buildDir/*.deb -rm -f $buildDir/*.changes -rm -f $buildDir/*.build -rm -f $buildDir/*.buildinfo