From fd5aa596d1af4e24cb3d1d168375704ddb0f9710 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Fri, 28 Dec 2018 17:42:15 -0500 Subject: [PATCH] feat: add support for building arbitrary releases This will let us support creating a build release that can be used to test anyone's PR. --- .dockerignore | 3 ++- .gitignore | 3 ++- contrib/build.Dockerfile | 5 +--- contrib/herokuish-build.Dockerfile | 5 +--- contrib/release | 32 +++++++++++++--------- contrib/release-dokku-update | 23 +++++++++------- contrib/release-herokuish | 22 ++++++++------- contrib/update-build.Dockerfile | 5 +--- deb.mk | 27 +++++++++---------- rpm.mk | 43 +++++++++++++----------------- 10 files changed, 83 insertions(+), 85 deletions(-) diff --git a/.dockerignore b/.dockerignore index 681b95662..4ae7a89ec 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,8 +3,9 @@ .git .vagrant contrib +build docs tests !contrib/dokku-installer.py !contrib/dokku-update -!contrib/bash-completion \ No newline at end of file +!contrib/bash-completion diff --git a/.gitignore b/.gitignore index f764c55d2..47cf7b700 100644 --- a/.gitignore +++ b/.gitignore @@ -4,8 +4,9 @@ .ruby-version .idea/ .vagrant +build/ data/ stack.tgz tmp coverage.out -contrib/dokku-update-version \ No newline at end of file +contrib/dokku-update-version diff --git a/contrib/build.Dockerfile b/contrib/build.Dockerfile index 98ca33291..df9452e69 100644 --- a/contrib/build.Dockerfile +++ b/contrib/build.Dockerfile @@ -39,7 +39,4 @@ RUN PLUGIN_MAKE_TARGET=${PLUGIN_MAKE_TARGET} \ && make deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update \ rpm-herokuish rpm-dokku rpm-plugn rpm-sshcommand rpm-sigil rpm-dokku-update -RUN mkdir -p /data \ - && cp /tmp/*.deb /data \ - && cp /tmp/*.rpm /data \ - && ls -lha /data/ +RUN ls -lha /tmp/ diff --git a/contrib/herokuish-build.Dockerfile b/contrib/herokuish-build.Dockerfile index 50b5ed002..3aaf33cad 100644 --- a/contrib/herokuish-build.Dockerfile +++ b/contrib/herokuish-build.Dockerfile @@ -13,7 +13,4 @@ COPY . ${WORKDIR} RUN make deb-herokuish rpm-herokuish -RUN mkdir -p /data \ - && cp /tmp/*.deb /data \ - && cp /tmp/*.rpm /data \ - && ls -lha /data/ +RUN ls -lha /tmp/ diff --git a/contrib/release b/contrib/release index 4e87d9adf..dd6eaebf4 100755 --- a/contrib/release +++ b/contrib/release @@ -68,7 +68,7 @@ fn-extract-package() { [[ "$IS_RELEASE" == "true" ]] && NAME="dokku:build-release" log-info "(extract-package) writing ${PACKAGE_NAME} to correct path" - docker run --rm --entrypoint cat "$NAME" "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}" + docker run --rm --entrypoint cat "$NAME" "/tmp/${PACKAGE_NAME}" > "${ROOT_DIR}/build/${PACKAGE_NAME}" return "$?" } @@ -313,7 +313,7 @@ fn-require-bin() { main() { declare RELEASE="$1" local CURRENT_VERSION NEXT_VERSION IS_RELEASE - local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish") + local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build") if [[ "$RELEASE" == '--trace' ]]; then shift 1 @@ -322,39 +322,45 @@ main() { fi if [[ -z "$RELEASE" ]]; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given" fi if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given" fi + log-info "Creating $RELEASE release" + + mkdir -p "build" fn-require-bin "docker" fn-require-bin "git" - fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + if [[ "$RELEASE" != "build" ]]; then + fn-require-bin "package_cloud" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + fi CURRENT_VERSION="$(fn-version-current)" NEXT_VERSION="$(fn-version-next "$CURRENT_VERSION" "$RELEASE")" IS_RELEASE="$(fn-is-release "$RELEASE")" fn-repo-update "$IS_RELEASE" "$CURRENT_VERSION" "$NEXT_VERSION" - fn-build-dokku "$IS_RELEASE" "$NEXT_VERSION" || log-fail "Error building package" - fn-extract-package "$IS_RELEASE" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package" - fn-extract-package "$IS_RELEASE" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package" - fn-publish-package "$IS_RELEASE" "deb" "dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" + if [[ "$RELEASE" != "build" ]]; then + fn-publish-package "$IS_RELEASE" "deb" "build/dokku_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" + fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" + fn-repo-push-tags "$IS_RELEASE" + fi - fn-publish-package "$IS_RELEASE" "rpm" "dokku-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" - - fn-repo-push-tags "$IS_RELEASE" if [[ "$IS_RELEASE" != "true" ]]; then git reset -q HEAD plugins/*/plugin.toml git checkout -- plugins/*/plugin.toml fi + + echo "build/dokku_${NEXT_VERSION}_amd64.deb" > build/deb-filename + echo "build/dokku-${NEXT_VERSION}-1.x86_64.rpm" > build/rpm-filename } main "$@" diff --git a/contrib/release-dokku-update b/contrib/release-dokku-update index 6e6becfd7..9e2259cf8 100755 --- a/contrib/release-dokku-update +++ b/contrib/release-dokku-update @@ -47,7 +47,7 @@ fn-extract-package() { fi log-info "(extract-package) writing ${PACKAGE_NAME} to correct path" - docker run --rm --entrypoint cat dokku-update:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}" + docker run --rm --entrypoint cat dokku-update:build "/tmp/${PACKAGE_NAME}" > "${ROOT_DIR}/build/${PACKAGE_NAME}" return "$?" } @@ -121,7 +121,7 @@ fn-require-bin() { main() { declare RELEASE="$1" local NEXT_VERSION - local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish") + local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build") if [[ "$RELEASE" == '--trace' ]]; then shift 1 @@ -130,29 +130,32 @@ main() { fi if [[ -z "$RELEASE" ]]; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given" fi if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given" fi + mkdir -p "build" fn-require-bin "docker" - fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + if [[ "$RELEASE" != "build" ]]; then + fn-require-bin "package_cloud" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + fi NEXT_VERSION="$(grep DOKKU_UPDATE_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" fn-build-dokku || log-fail "Error building package" - fn-extract-package "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package" - fn-extract-package "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package" - fn-publish-package "$IS_RELEASE" "deb" "dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" + if [[ "$RELEASE" != "build" ]]; then + fn-publish-package "$IS_RELEASE" "deb" "build/dokku-update_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" + fn-publish-package "$IS_RELEASE" "rpm" "build/dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" + fi - fn-publish-package "$IS_RELEASE" "rpm" "dokku-update-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" } main "$@" diff --git a/contrib/release-herokuish b/contrib/release-herokuish index fd921857c..e2c9b2cc6 100755 --- a/contrib/release-herokuish +++ b/contrib/release-herokuish @@ -47,7 +47,7 @@ fn-extract-package() { fi log-info "(extract-package) writing ${PACKAGE_NAME} to correct path" - docker run --rm --entrypoint cat herokuish:build "/data/${PACKAGE_NAME}" > "${ROOT_DIR}/${PACKAGE_NAME}" + docker run --rm --entrypoint cat herokuish:build "/tmp/${PACKAGE_NAME}" > "${ROOT_DIR}/build/${PACKAGE_NAME}" return "$?" } @@ -121,7 +121,7 @@ fn-require-bin() { main() { declare RELEASE="$1" local NEXT_VERSION - local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish") + local VALID_RELEASE_LEVELS=("major" "minor" "patch" "betafish" "build") if [[ "$RELEASE" == '--trace' ]]; then shift 1 @@ -130,27 +130,31 @@ main() { fi if [[ -z "$RELEASE" ]]; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], none given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], none given" fi if ! fn-in-array "$RELEASE" "${VALID_RELEASE_LEVELS[@]}"; then - log-fail "Argument 1 must be one of [major, minor, patch, betafish], '${RELEASE}' given" + log-fail "Argument 1 must be one of [major, minor, patch, betafish, build], '${RELEASE}' given" fi + mkdir -p "build" fn-require-bin "docker" - fn-require-bin "package_cloud" - [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + if [[ "$RELEASE" != "build" ]]; then + fn-require-bin "package_cloud" + [[ -n "$PACKAGECLOUD_TOKEN" ]] || log-fail "Missing PACKAGECLOUD_TOKEN environment variable" + fi NEXT_VERSION="$(grep HEROKUISH_VERSION deb.mk | head -n1 | cut -d'=' -f2 | xargs)" IS_RELEASE="$(fn-is-release "$RELEASE")" fn-build-dokku || log-fail "Error building package" - fn-extract-package "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error extracting deb package" fn-extract-package "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error extracting rpm package" - fn-publish-package "$IS_RELEASE" "deb" "herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" - fn-publish-package "$IS_RELEASE" "rpm" "herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" + if [[ "$RELEASE" != "build" ]]; then + fn-publish-package "$IS_RELEASE" "deb" "build/herokuish_${NEXT_VERSION}_amd64.deb" || log-fail "Error publishing deb package" + fn-publish-package "$IS_RELEASE" "rpm" "build/herokuish-${NEXT_VERSION}-1.x86_64.rpm" || log-fail "Error publishing rpm package" + fi } main "$@" diff --git a/contrib/update-build.Dockerfile b/contrib/update-build.Dockerfile index fb7424860..dde97653f 100644 --- a/contrib/update-build.Dockerfile +++ b/contrib/update-build.Dockerfile @@ -13,7 +13,4 @@ COPY . ${WORKDIR} RUN make deb-dokku-update rpm-dokku-update -RUN mkdir -p /data \ - && cp /tmp/*.deb /data \ - && cp /tmp/*.rpm /data \ - && ls -lha /data/ +RUN ls -lha /tmp/ diff --git a/deb.mk b/deb.mk index af6255f4c..b38f18203 100644 --- a/deb.mk +++ b/deb.mk @@ -1,3 +1,5 @@ +BUILD_DIRECTORY ?= /tmp + HEROKUISH_DESCRIPTION = 'Herokuish uses Docker and Buildpacks to build applications like Heroku' HEROKUISH_REPO_NAME ?= gliderlabs/herokuish HEROKUISH_VERSION ?= 0.4.5 @@ -75,7 +77,7 @@ install-from-deb: sudo DEBIAN_FRONTEND=noninteractive DEBCONF_NONINTERACTIVE_SEEN=true apt-get install -yy dokku deb-all: deb-setup deb-herokuish deb-dokku deb-plugn deb-sshcommand deb-sigil deb-dokku-update - mv /tmp/*.deb . + mv $(BUILD_DIRECTORY)/*.deb . @echo "Done" deb-setup: @@ -100,9 +102,9 @@ deb-herokuish: @echo "-> Creating $(HEROKUISH_PACKAGE_NAME)" sudo fpm -t deb -s dir -C /tmp/build -n herokuish \ - -v $(HEROKUISH_VERSION) \ - -a $(HEROKUISH_ARCHITECTURE) \ - -p $(HEROKUISH_PACKAGE_NAME) \ + --version $(HEROKUISH_VERSION) \ + --architecture $(HEROKUISH_ARCHITECTURE) \ + --package $(BUILD_DIRECTORY)/$(HEROKUISH_PACKAGE_NAME) \ --deb-pre-depends 'docker-engine-cs (>= 1.9.1) | docker-engine (>= 1.9.1) | docker-ce | docker-ee' \ --deb-pre-depends sudo \ --after-install /tmp/tmp/post-install \ @@ -110,7 +112,6 @@ deb-herokuish: --description $(HEROKUISH_DESCRIPTION) \ --license 'MIT License' \ . - mv *.deb /tmp deb-dokku: rm -rf /tmp/tmp /tmp/build dokku_*_$(DOKKU_ARCHITECTURE).deb @@ -157,8 +158,8 @@ else git rev-parse HEAD > /tmp/build/var/lib/dokku/GIT_REV endif sed -i.bak "s/^Version: .*/Version: `cat /tmp/build/var/lib/dokku/STABLE_VERSION`/g" /tmp/build/DEBIAN/control && rm /tmp/build/DEBIAN/control.bak - dpkg-deb --build /tmp/build "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" - lintian "/tmp/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" + dpkg-deb --build /tmp/build "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" + lintian "$(BUILD_DIRECTORY)/dokku_`cat /tmp/build/var/lib/dokku/VERSION`_$(DOKKU_ARCHITECTURE).deb" deb-dokku-update: rm -rf /tmp/dokku-update*.deb dokku-update*.deb @@ -166,14 +167,13 @@ deb-dokku-update: sudo fpm -t deb -s dir -n dokku-update \ --version $(DOKKU_UPDATE_VERSION) \ --architecture $(DOKKU_UPDATE_ARCHITECTURE) \ - --package $(DOKKU_UPDATE_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_PACKAGE_NAME) \ --depends 'dokku' \ --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \ --description $(DOKKU_UPDATE_DESCRIPTION) \ --license 'MIT License' \ contrib/dokku-update=/usr/local/bin/dokku-update \ contrib/dokku-update-version=/var/lib/dokku-update/VERSION - mv *.deb /tmp deb-plugn: rm -rf /tmp/tmp /tmp/build $(PLUGN_PACKAGE_NAME) @@ -190,14 +190,13 @@ deb-plugn: sudo fpm -t deb -s dir -C /tmp/build -n plugn \ --version $(PLUGN_VERSION) \ --architecture $(PLUGN_ARCHITECTURE) \ - --package $(PLUGN_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(PLUGN_PACKAGE_NAME) \ --url "https://github.com/$(PLUGN_REPO_NAME)" \ --maintainer "Jose Diaz-Gonzalez " \ --category utils \ --description "$$PLUGN_DESCRIPTION" \ --license 'MIT License' \ . - mv *.deb /tmp deb-sshcommand: rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_PACKAGE_NAME) @@ -215,14 +214,13 @@ deb-sshcommand: sudo fpm -t deb -s dir -C /tmp/build -n sshcommand \ --version $(SSHCOMMAND_VERSION) \ --architecture $(SSHCOMMAND_ARCHITECTURE) \ - --package $(SSHCOMMAND_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_PACKAGE_NAME) \ --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \ --maintainer "Jose Diaz-Gonzalez " \ --category admin \ --description "$$SSHCOMMAND_DESCRIPTION" \ --license 'MIT License' \ . - mv *.deb /tmp deb-sigil: rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME) @@ -239,11 +237,10 @@ deb-sigil: sudo fpm -t deb -s dir -C /tmp/build -n gliderlabs-sigil \ --version $(SIGIL_VERSION) \ --architecture $(SIGIL_ARCHITECTURE) \ - --package $(SIGIL_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(SIGIL_PACKAGE_NAME) \ --url "https://github.com/$(SIGIL_REPO_NAME)" \ --maintainer "Jose Diaz-Gonzalez " \ --category utils \ --description "$$SIGIL_DESCRIPTION" \ --license 'MIT License' \ . - mv *.deb /tmp diff --git a/rpm.mk b/rpm.mk index 61340546d..49bdda841 100644 --- a/rpm.mk +++ b/rpm.mk @@ -1,4 +1,5 @@ RPM_ARCHITECTURE = x86_64 +DOKKU_RPM_PACKAGE_NAME = dokku-$(DOKKU_VERSION)-1.$(RPM_ARCHITECTURE).rpm DOKKU_UPDATE_RPM_PACKAGE_NAME = dokku-update-$(DOKKU_UPDATE_VERSION)-1.$(RPM_ARCHITECTURE).rpm HEROKUISH_RPM_PACKAGE_NAME = herokuish-$(HEROKUISH_VERSION)-1.$(RPM_ARCHITECTURE).rpm PLUGN_RPM_PACKAGE_NAME = plugn-$(PLUGN_VERSION)-1.$(RPM_ARCHITECTURE).rpm @@ -19,7 +20,7 @@ rpm-setup: @ssh -o StrictHostKeyChecking=no git@github.com || true rpm-herokuish: - rm -rf /tmp/tmp /tmp/build $(HEROKUISH_RPM_PACKAGE_NAME) + rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(HEROKUISH_RPM_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build @echo "-> Creating rpm files" @@ -35,9 +36,9 @@ rpm-herokuish: @echo "-> Creating $(HEROKUISH_RPM_PACKAGE_NAME)" sudo fpm -t rpm -s dir -C /tmp/build -n herokuish \ - -v $(HEROKUISH_VERSION) \ - -a $(RPM_ARCHITECTURE) \ - -p $(HEROKUISH_RPM_PACKAGE_NAME) \ + --version $(HEROKUISH_VERSION) \ + --architecture $(RPM_ARCHITECTURE) \ + --package $(BUILD_DIRECTORY)/$(HEROKUISH_RPM_PACKAGE_NAME) \ --depends '/usr/bin/docker' \ --depends 'sudo' \ --after-install /tmp/tmp/post-install \ @@ -45,10 +46,9 @@ rpm-herokuish: --description $(HEROKUISH_DESCRIPTION) \ --license 'MIT License' \ . - mv *.rpm /tmp rpm-dokku: - rm -rf /tmp/tmp /tmp/build dokku_*_$(RPM_ARCHITECTURE).rpm + rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/dokku_*_$(RPM_ARCHITECTURE).rpm mkdir -p /tmp/tmp /tmp/build mkdir -p /tmp/build/usr/share/bash-completion/completions @@ -92,9 +92,9 @@ endif @echo "-> Creating rpm package" VERSION=$$(cat /tmp/build/var/lib/dokku/STABLE_VERSION); \ sudo fpm -t rpm -s dir -C /tmp/build -n dokku \ - -v "$$VERSION" \ - -a $(RPM_ARCHITECTURE) \ - -p "dokku-$$VERSION-1.x86_64.rpm" \ + --version "$$VERSION" \ + --architecture $(RPM_ARCHITECTURE) \ + --package "$(BUILD_DIRECTORY)/$(DOKKU_RPM_PACKAGE_NAME)" \ --depends '/usr/bin/docker' \ --depends 'bind-utils' \ --depends 'curl' \ @@ -115,25 +115,23 @@ endif --description $(DOKKU_DESCRIPTION) \ --license 'MIT License' \ . - mv *.rpm "/tmp/dokku-`cat /tmp/build/var/lib/dokku/VERSION`-1.$(RPM_ARCHITECTURE).rpm" rpm-dokku-update: - rm -rf /tmp/dokku-update*.rpm dokku-update*.rpm + rm -rf $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_RPM_PACKAGE_NAME) echo "${DOKKU_UPDATE_VERSION}" > contrib/dokku-update-version sudo fpm -t rpm -s dir -n dokku-update \ --version $(DOKKU_UPDATE_VERSION) \ --architecture $(RPM_ARCHITECTURE) \ - --package $(DOKKU_UPDATE_RPM_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(DOKKU_UPDATE_RPM_PACKAGE_NAME) \ --depends 'dokku' \ --url "https://github.com/$(DOKKU_UPDATE_REPO_NAME)" \ --description $(DOKKU_UPDATE_DESCRIPTION) \ --license 'MIT License' \ contrib/dokku-update=/usr/local/bin/dokku-update \ contrib/dokku-update-version=/var/lib/dokku-update/VERSION - mv *.rpm /tmp rpm-plugn: - rm -rf /tmp/tmp /tmp/build $(PLUGN_RPM_PACKAGE_NAME) + rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(PLUGN_RPM_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin @echo "-> Downloading package" @@ -147,16 +145,15 @@ rpm-plugn: sudo fpm -t rpm -s dir -C /tmp/build -n plugn \ --version $(PLUGN_VERSION) \ --architecture $(RPM_ARCHITECTURE) \ - --package $(PLUGN_RPM_PACKAGE_NAME) \ + --package $(BUILD_DIRECTORY)/$(PLUGN_RPM_PACKAGE_NAME) \ --url "https://github.com/$(PLUGN_REPO_NAME)" \ --category utils \ --description "$$PLUGN_DESCRIPTION" \ --license 'MIT License' \ . - mv *.rpm /tmp rpm-sshcommand: - rm -rf /tmp/tmp /tmp/build $(SSHCOMMAND_RPM_PACKAGE_NAME) + rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin @echo "-> Downloading package" @@ -170,17 +167,16 @@ rpm-sshcommand: @echo "-> Creating $(SSHCOMMAND_RPM_PACKAGE_NAME)" sudo fpm -t rpm -s dir -C /tmp/build -n sshcommand \ --version $(SSHCOMMAND_VERSION) \ - -a $(RPM_ARCHITECTURE) \ - --package $(SSHCOMMAND_RPM_PACKAGE_NAME) \ + --architecture $(RPM_ARCHITECTURE) \ + --package $(BUILD_DIRECTORY)/$(SSHCOMMAND_RPM_PACKAGE_NAME) \ --url "https://github.com/$(SSHCOMMAND_REPO_NAME)" \ --category admin \ --description "$$SSHCOMMAND_DESCRIPTION" \ --license 'MIT License' \ . - mv *.rpm /tmp rpm-sigil: - rm -rf /tmp/tmp /tmp/build $(SIGIL_PACKAGE_NAME) + rm -rf /tmp/tmp /tmp/build $(BUILD_DIRECTORY)/$(SIGIL_RPM_PACKAGE_NAME) mkdir -p /tmp/tmp /tmp/build /tmp/build/usr/bin @echo "-> Downloading package" @@ -193,11 +189,10 @@ rpm-sigil: @echo "-> Creating $(SIGIL_RPM_PACKAGE_NAME)" sudo fpm -t rpm -s dir -C /tmp/build -n gliderlabs-sigil \ --version $(SIGIL_VERSION) \ - -a $(RPM_ARCHITECTURE) \ - --package $(SIGIL_RPM_PACKAGE_NAME) \ + --architecture $(RPM_ARCHITECTURE) \ + --package $(BUILD_DIRECTORY)/$(SIGIL_RPM_PACKAGE_NAME) \ --url "https://github.com/$(SIGIL_REPO_NAME)" \ --category utils \ --description "$$SIGIL_DESCRIPTION" \ --license 'MIT License' \ . - mv *.rpm /tmp