Use goreleaser for building .deb packages.

brocaar · brocaar · commit 82922202772e · 2018-10-03T09:37:58.000+02:00
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -1,6 +1,8 @@
 git:
   short_hash: true
 
+project_name: lora-gateway-bridge
+
 builds:
   - main: cmd/lora-gateway-bridge/main.go
     binary: lora-gateway-bridge
@@ -22,4 +24,21 @@ builds:
         goarch: 386
 
 release:
-  draft: true
+  disable: true
+
+nfpm:
+  vendor: LoRa Server project
+  homepage: https://www.loraserver.io/
+  maintainer: Orne Brocaar <info@brocaar.com>
+  description: LoRa Gateway Bridge
+  license: MIT
+  formats:
+    - deb
+  bindir: /usr/bin
+  files:
+    "packaging/files/lora-gateway-bridge.rotate": "/etc/logrotate.d/lora-gateway-bridge"
+    "packaging/files/lora-gateway-bridge.init": "/usr/lib/lora-gateway-bridge/scripts/lora-gateway-bridge.init"
+    "packaging/files/lora-gateway-bridge.service": "/usr/lib/lora-gateway-bridge/scripts/lora-gateway-bridge.service"
+  scripts:
+    postinstall: "packaging/scripts/post-install.sh"
+    postremove: "packaging/scripts/post-remove.sh"
diff --git a/.travis.yml b/.travis.yml
@@ -14,15 +14,10 @@ before_deploy:
 
       docker-compose run --rm gatewaybridge make dist;
 
-      docker-compose run --rm -e PACKAGE_ARCH=x86_64 gatewaybridge make package-deb;
-      docker-compose run --rm -e PACKAGE_ARCH=i386 gatewaybridge make package-deb;
-      docker-compose run --rm -e PACKAGE_ARCH=armhf gatewaybridge make package-deb;
-      docker-compose run --rm -e PACKAGE_ARCH=arm64 gatewaybridge make package-deb;
-
       mkdir -p dist/upload/tar;
       mkdir -p dist/upload/deb;
       mv dist/*.tar.gz dist/upload/tar;
-      mv dist/deb/*.deb dist/upload/deb;
+      mv dist/*.deb dist/upload/deb;
     fi
 
 deploy:
diff --git a/Dockerfile-devel b/Dockerfile-devel
@@ -5,8 +5,7 @@ ENV PATH=$PATH:$PROJECT_PATH/build
 ENV CGO_ENABLED=0
 ENV GO_EXTRA_BUILD_ARGS="-a -installsuffix cgo"
 
-RUN apk add --no-cache ca-certificates make git bash alpine-sdk ruby ruby-dev libffi-dev
-RUN gem install fpm --no-rdoc --no-ri
+RUN apk add --no-cache ca-certificates make git bash alpine-sdk
 
 RUN mkdir -p $PROJECT_PATH
 COPY . $PROJECT_PATH
diff --git a/Makefile b/Makefile
@@ -27,14 +27,12 @@ dist:
 snapshot:
 	@goreleaser --snapshot
 
-package-deb: dist
-	@cd packaging && TARGET=deb ./package.sh
-
 dev-requirements:
 	go get -u github.com/golang/lint/golint
 	go get -u github.com/kisielk/errcheck
 	go get -u github.com/golang/dep/cmd/dep
 	go get -u github.com/goreleaser/goreleaser
+	go get -u github.com/goreleaser/nfpm
 
 requirements:
 	dep ensure -v
diff --git a/docs/content/overview/downloads.md b/docs/content/overview/downloads.md
@@ -26,12 +26,14 @@ description: Pre-compiled binaries for Windows, MacOS and Linux (tarball and Deb
 
 ## Debian / Ubuntu packages
 
-| File name                                                                                                                                                    | OS      | Arch  |
-| -------------------------------------------------------------------------------------------------------------------------------------------------------------| ------- | ----- |
-| [lora-gateway-bridge_{{< version >}}_i386.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_i386.deb)   | Linux   | 386   |
-| [lora-gateway-bridge_{{< version >}}_amd64.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_amd64.deb) | Linux   | amd64 |
-| [lora-gateway-bridge_{{< version >}}_armhf.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_armhf.deb) | Linux   | arm   |
-| [lora-gateway-bridge_{{< version >}}_arm64.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_arm64.deb) | Linux   | arm64 |
+| File name                                                                                                                                                                | OS      | Arch  |
+| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------| ------- | ----- |
+| [lora-gateway-bridge_{{< version >}}_linux_386.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_386.deb)     | Linux   | 386   |
+| [lora-gateway-bridge_{{< version >}}_linux_amd64.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_amd64.deb) | Linux   | amd64 |
+| [lora-gateway-bridge_{{< version >}}_linux_armv5.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_armv5.deb) | Linux   | arm   |
+| [lora-gateway-bridge_{{< version >}}_linux_armv6.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_armv6.deb) | Linux   | arm   |
+| [lora-gateway-bridge_{{< version >}}_linux_armv7.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_armv7.deb) | Linux   | arm   |
+| [lora-gateway-bridge_{{< version >}}_linux_arm64.deb](https://artifacts.loraserver.io/downloads/lora-gateway-bridge/lora-gateway-bridge_{{< version >}}_linux_arm64.deb) | Linux   | arm64 |
 
 ## Debian / Ubuntu repository
 
diff --git a/packaging/deb/pre-install.sh b/packaging/deb/pre-install.sh
diff --git a/packaging/files/lora-gateway-bridge.init b/packaging/files/lora-gateway-bridge.init
@@ -5,16 +5,18 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
-# Short-Description: LoRa Gateway Bridge abstracts the packet_forwarder protocol into JSON over MQTT
+# Short-Description: LoRa Gateway Bridge
 ### END INIT INFO
 
+
 NAME=lora-gateway-bridge
 DESC="LoRa Gateway Bridge"
 DAEMON_USER=gatewaybridge
 DAEMON_GROUP=gatewaybridge
 DAEMON=/usr/bin/$NAME
 PID_FILE=/var/run/$NAME.pid
 
+
 # check root
 if [ "$UID" != "0" ]; then
     echo "You must be root to run this script"
diff --git a/packaging/files/lora-gateway-bridge.rotate b/packaging/files/lora-gateway-bridge.rotate
diff --git a/packaging/files/lora-gateway-bridge.service b/packaging/files/lora-gateway-bridge.service
@@ -1,8 +1,8 @@
 [Unit]
 Description=LoRa Gateway Bridge
-Documentation=https://docs.loraserver.io
+Documentation=https://www.loraserver.io/
 Wants=network-online.target
-After=network-online.target mosquitto.service
+After=network-online.target
 
 [Service]
 User=gatewaybridge
diff --git a/packaging/package.sh b/packaging/package.sh
diff --git a/packaging/scripts/post-install.sh b/packaging/scripts/post-install.sh
@@ -2,13 +2,13 @@
 
 NAME=lora-gateway-bridge
 BIN_DIR=/usr/bin
-SCRIPT_DIR=/usr/lib/$NAME/scripts
-LOG_DIR=/var/log/$NAME
+SCRIPT_DIR=/usr/lib/lora-gateway-bridge/scripts
+LOG_DIR=/var/log/lora-gateway-bridge
 DAEMON_USER=gatewaybridge
 DAEMON_GROUP=gatewaybridge
 
 function install_init {
-	cp -f $SCRIPT_DIR/init.sh /etc/init.d/$NAME
+	cp -f $SCRIPT_DIR/$NAME.init /etc/init.d/$NAME
 	chmod +x /etc/init.d/$NAME
 	update-rc.d $NAME defaults
 }
@@ -19,8 +19,8 @@ function install_systemd {
 	systemctl enable $NAME
 }
 
-function restart_gatewaybridge {
-	echo "Restarting LoRa Gateway Bridge"
+function restart_service {
+	echo "Restarting $NAME"
 	which systemctl &>/dev/null
 	if [[ $? -eq 0 ]]; then
 		systemctl daemon-reload
@@ -30,7 +30,7 @@ function restart_gatewaybridge {
 	fi	
 }
 
-# create gatewaybridge user
+# create user
 id $DAEMON_USER &>/dev/null
 if [[ $? -ne 0 ]]; then
 	useradd --system -U -M $DAEMON_USER -s /bin/false -d /etc/$NAME
@@ -46,41 +46,23 @@ if [[ ! -d /etc/$NAME ]]; then
 	chmod 750 /etc/$NAME
 fi
 
-# migrate old environment variable based configuration to new format and
-# path.
-if [[ -f /etc/default/$NAME && ! -f /etc/$NAME/$NAME.toml ]]; then
-	set -a
-	source /etc/default/$NAME
-	lora-gateway-bridge configfile > /etc/$NAME/$NAME.toml
-	chown $DAEMON_USER:$DAEMON_GROUP /etc/$NAME/$NAME.toml
-	chmod 640 /etc/$NAME/$NAME.toml
-	mv /etc/default/$NAME /etc/default/$NAME.backup
-
-	echo -e "\n\n\n"
-	echo "-----------------------------------------------------------------------------------------"
-	echo "Your configuration file has been migrated to a new location and format!"
-	echo "Path: /etc/$NAME/$NAME.toml"
-	echo "-----------------------------------------------------------------------------------------"
-	echo -e "\n\n\n"
-fi
-
 # create example configuration file
 if [[ ! -f /etc/$NAME/$NAME.toml ]]; then
-	lora-gateway-bridge configfile > /etc/$NAME/$NAME.toml
+	$NAME configfile > /etc/$NAME/$NAME.toml
 	chown $DAEMON_USER:$DAEMON_GROUP /etc/$NAME/$NAME.toml
 	chmod 640 /etc/$NAME/$NAME.toml
 	echo -e "\n\n\n"
-	echo "-----------------------------------------------------------------------------------------"
+	echo "---------------------------------------------------------------------------------"
 	echo "A sample configuration file has been copied to: /etc/$NAME/$NAME.toml"
-	echo "After setting the correct values, run the following command to start LoRa Gateway Bridge:"
+	echo "After setting the correct values, run the following command to start $NAME:"
 	echo ""
 	which systemctl &>/dev/null
 	if [[ $? -eq 0 ]]; then
 		echo "$ sudo systemctl start $NAME"
 	else
 		echo "$ sudo /etc/init.d/$NAME start"
 	fi
-	echo "-----------------------------------------------------------------------------------------"
+	echo "---------------------------------------------------------------------------------"
 	echo -e "\n\n\n"
 fi
 
@@ -93,5 +75,5 @@ else
 fi
 
 if [[ -n $2 ]]; then
-	restart_gatewaybridge
+	restart_service
 fi
diff --git a/packaging/scripts/post-remove.sh b/packaging/scripts/post-remove.sh
@@ -20,4 +20,3 @@ if [[ $? -eq 0 ]]; then
 else
 	remove_initd
 fi
-
