From 171df7ab30c65f8314775ffddd41e5ec0ab27fd8 Mon Sep 17 00:00:00 2001 From: Tyler Date: Mon, 11 Sep 2017 00:05:19 -0400 Subject: [PATCH] Fix packaging images --- .gitlab-ci.yml | 3 +++ packaging/build-package.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9dc618e..5432dba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,6 +25,7 @@ build: package-i386: stage: package + image: tystuyfzand/fpm script: - cd $CI_PROJECT_DIR - ARCH=i386 packaging/build-package.sh @@ -36,6 +37,7 @@ package-i386: package-amd64: stage: package + image: tystuyfzand/fpm script: - cd $CI_PROJECT_DIR - ARCH=amd64 packaging/build-package.sh @@ -47,6 +49,7 @@ package-amd64: package-armv7: stage: package + image: tystuyfzand/fpm script: - cd $CI_PROJECT_DIR - ARCH=armv7 packaging/build-package.sh diff --git a/packaging/build-package.sh b/packaging/build-package.sh index dc77f50..6e85bd6 100644 --- a/packaging/build-package.sh +++ b/packaging/build-package.sh @@ -4,7 +4,7 @@ fpm -s dir -t deb -p build/amd64/deb-simple_$VERSION.deb \ --deb-priority optional --force \ --deb-compression bzip2 \ --description "Dead Simple Package Manager" \ - -m "Tyler Stuyfzand " --vendor "Meow.tf" + -m "Tyler Stuyfzand " --vendor "Meow.tf" \ --before-install packaging/scripts/preinst.deb \ -a $ARCH build/$ARCH/deb-simple=/usr/bin/deb-simple \ packaging/deb-simple.service=/lib/systemd/system/deb-simple.service \