pass in more
This commit is contained in:
		
							parent
							
								
									d6d237996e
								
							
						
					
					
						commit
						69b48d5427
					
				|  | @ -1,6 +1,6 @@ | ||||||
| # Each line must have an export clause. | # Each line must have an export clause. | ||||||
| # This file is parsed and sourced by the Makefile, Docker and Homebrew builds. | # This file is parsed and sourced by the Makefile, Docker and Homebrew builds. | ||||||
| 
 | TITLE="UniFi Poller" | ||||||
| # github username | # github username | ||||||
| GHUSER="davidnewhall" | GHUSER="davidnewhall" | ||||||
| # docker hub username | # docker hub username | ||||||
|  | @ -30,5 +30,5 @@ ITERATION=$(git rev-list --count --all || echo 0) | ||||||
| DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" | DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" | ||||||
| COMMIT="$(git rev-parse --short HEAD || echo 0)" | COMMIT="$(git rev-parse --short HEAD || echo 0)" | ||||||
| 
 | 
 | ||||||
| export GHUSER DHUSER MAINT DESC CONFIG_FILE LICENSE GOLANGCI_LINT_ARGS | export TITLE GHUSER DHUSER MAINT VENDOR DESC CONFIG_FILE LICENSE GOLANGCI_LINT_ARGS | ||||||
| export BINARY GHREPO URL VERSION_PATH VERSION ITERATION DATE COMMIT | export BINARY GHREPO URL VERSION_PATH VERSION ITERATION DATE COMMIT | ||||||
|  |  | ||||||
							
								
								
									
										22
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										22
									
								
								Makefile
								
								
								
								
							|  | @ -119,7 +119,7 @@ $(BINARY)-$(RPMVERSION)-$(ITERATION).x86_64.rpm: package_build_linux check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -137,7 +137,7 @@ $(BINARY)_$(VERSION)-$(ITERATION)_amd64.deb: package_build_linux check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -155,7 +155,7 @@ $(BINARY)-$(RPMVERSION)-$(ITERATION).i386.rpm: package_build_linux_386 check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -173,7 +173,7 @@ $(BINARY)_$(VERSION)-$(ITERATION)_i386.deb: package_build_linux_386 check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -191,7 +191,7 @@ $(BINARY)-$(RPMVERSION)-$(ITERATION).arm64.rpm: package_build_linux_arm64 check_ | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -209,7 +209,7 @@ $(BINARY)_$(VERSION)-$(ITERATION)_arm64.deb: package_build_linux_arm64 check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -227,7 +227,7 @@ $(BINARY)-$(RPMVERSION)-$(ITERATION).armhf.rpm: package_build_linux_armhf check_ | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -245,7 +245,7 @@ $(BINARY)_$(VERSION)-$(ITERATION)_armhf.deb: package_build_linux_armhf check_fpm | ||||||
| 		--iteration $(ITERATION) \
 | 		--iteration $(ITERATION) \
 | ||||||
| 		--after-install scripts/after-install.sh \
 | 		--after-install scripts/after-install.sh \
 | ||||||
| 		--before-remove scripts/before-remove.sh \
 | 		--before-remove scripts/before-remove.sh \
 | ||||||
| 		--license MIT \
 | 		--license $(LICENSE) \
 | ||||||
| 		--url $(URL) \
 | 		--url $(URL) \
 | ||||||
| 		--maintainer "$(MAINT)" \
 | 		--maintainer "$(MAINT)" \
 | ||||||
| 		--description "$(DESC)" \
 | 		--description "$(DESC)" \
 | ||||||
|  | @ -257,6 +257,12 @@ docker: | ||||||
| 		--build-arg "BUILD_DATE=${DATE}" \
 | 		--build-arg "BUILD_DATE=${DATE}" \
 | ||||||
| 		--build-arg "COMMIT=${COMMIT}" \
 | 		--build-arg "COMMIT=${COMMIT}" \
 | ||||||
| 		--build-arg "VERSION=${VERSION}-${ITERATION}" \
 | 		--build-arg "VERSION=${VERSION}-${ITERATION}" \
 | ||||||
|  | 		--build-arg "LICENSE=${LICENSE}" \
 | ||||||
|  | 		--build-arg "TITLE=${TITLE}" \
 | ||||||
|  | 		--build-arg "DESC=${DESC}" \
 | ||||||
|  | 		--build-arg "URL=${URL}" \
 | ||||||
|  | 		--build-arg "VENDOR=${VENDOR}" \
 | ||||||
|  | 		--build-arg "AUTHOR=${MAINT}" \
 | ||||||
| 		--tag $(DHUSER)/$(BINARY):local . | 		--tag $(DHUSER)/$(BINARY):local . | ||||||
| 
 | 
 | ||||||
| # Build an environment that can be packaged for linux.
 | # Build an environment that can be packaged for linux.
 | ||||||
|  |  | ||||||
|  | @ -25,7 +25,7 @@ for build in $BUILDS; do | ||||||
|     --build-arg "DESC=${DESC}" \ |     --build-arg "DESC=${DESC}" \ | ||||||
|     --build-arg "URL=${URL}" \ |     --build-arg "URL=${URL}" \ | ||||||
|     --build-arg "VENDOR=${VENDOR}" \ |     --build-arg "VENDOR=${VENDOR}" \ | ||||||
|     --build-arg "AUTHOR=${AUTHOR}" \ |     --build-arg "AUTHOR=${MAINT}" \ | ||||||
|     --tag "${IMAGE_NAME}_${os}_${name}" \ |     --tag "${IMAGE_NAME}_${os}_${name}" \ | ||||||
|     --file Dockerfile ../.. |     --file Dockerfile ../.. | ||||||
| done | done | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue