From e1b4e9245c1c9878e6772694f84fd6089b75c06f Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Sun, 14 Jul 2019 22:57:45 -0700 Subject: [PATCH 1/4] Update app builder --- .metadata.sh | 19 ++++++++++++++----- .secret_files.tar.enc | Bin 8208 -> 6160 bytes Makefile | 14 ++++++++------ init/docker/Dockerfile | 21 +++++++++++---------- init/docker/hooks/build | 3 ++- init/homebrew/service.rb.tmpl | 9 +++++---- scripts/formula-deploy.sh | 2 +- 7 files changed, 41 insertions(+), 27 deletions(-) diff --git a/.metadata.sh b/.metadata.sh index b0c2a17d..2ae87146 100755 --- a/.metadata.sh +++ b/.metadata.sh @@ -25,13 +25,17 @@ export BINARY GHUSER HBREPO MAINT VENDOR DESC GOLANGCI_LINT_ARGS CONFIG_FILE LIC # Fix the repo if it doesn't match the binary name. # Provide a better URL if one exists. -GHREPO="${GHUSER}/${BINARY}" -URL="https://github.com/${GHREPO}" +# Used as go import path in docker and homebrew builds. +IMPORT_PATH="github.com/${GHUSER}/${BINARY}" +# Used for source links and wiki links. +SOURCE_URL="https://${IMPORT_PATH}" +# Used for documentation links. +URL="${SOURCE_URL}" # This parameter is passed in as -X to go build. Used to override the Version variable in a package. -# This makes a path like github.com/davidnewhall/unifi-poller/unifipoller.Version=1.3.3 +# This makes a path like github.com/user/hello-world/helloworld.Version=1.3.3 # Name the Version-containing library the same as the github repo, without dashes. -VERSION_PATH="github.com/${GHREPO}/$(echo ${BINARY} | tr -d -- -).Version" +VERSION_PATH="${IMPORT_PATH}/$(echo ${BINARY} | tr -d -- -).Version" # Dynamic. Recommend not changing. VVERSION=$(git describe --abbrev=0 --tags $(git rev-list --tags --max-count=1)) @@ -41,4 +45,9 @@ ITERATION=$(git rev-list --count --all || echo 0) DATE="$(date -u +%Y-%m-%dT%H:%M:%SZ)" COMMIT="$(git rev-parse --short HEAD || echo 0)" -export GHREPO URL VERSION_PATH VERSION ITERATION DATE COMMIT +# Used by homebrew downloads. +#SOURCE_PATH=https://codeload.${IMPORT_PATH}/tar.gz/v${VERSION} +# This is a custom download path for homebrew formula. +SOURCE_PATH=https://code.golift.io/${BINARY}/tar.gz/v${VERSION} + +export IMPORT_PATH SOURCE_URL URL VERSION_PATH VVERSION VERSION ITERATION DATE COMMIT SOURCE_PATH diff --git a/.secret_files.tar.enc b/.secret_files.tar.enc index 9a799392131768bda535c2de18e14f532dcbb76a..be29d5140032168fed17f11312e33afbdecc1a26 100644 GIT binary patch literal 6160 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 literal 8208 zcmV+rAn)HwvrIRRvnUDQGe$leJ5bPHIUIhwp`i56?oiO zCTvKWuS#zPRmmD|NU>j6N_w1(0_q1PdbC<)?nsLhicA;loabDoCXUe4)0^EfT_trX zz>h%xHLxAW$e#eTY%{NTRlqe`oLqTZQiN0lGI6~E7|7ypjZ?R+8r+zHtKRQR{Z+4= zSQ(!r+J01`@5fM#VVLh;>}s>_Q-F4g-rr@6a&DLLB6KlFW1ehcDcZXF z)8t4$+v|(k7k32{?@7WD@4I1hbn*E%j-@wMkOT)YNb3{)EP`S9dBIs3tQsGdR>}jZ zMUi8)mn0{A+TM??8-GX2gDyMM@#!dhGIYSlD}2P`nNM0pSV#z&7soXP&%*z)TjqKywRkcYNhpf5@kr82;s9q(-VmlJ*kV=m!F5eVyp z7@(KeX2L%2fxUsTp&AbN@122UAEkk7SsZMH^CM~hHl{rw3s!+^VhvoKzojOjBpW7} z=L|@XR)gVtQvToLsjvXScKBmQzHfzWAU+c3$u$h=3(71)ImVGL{_z82d&{3O9!wuV zTjGTx#0N=x<%N&q7y#jf<#Ykj=U}TKQucN#Zk&NR5z@n6snjDS0)10CB~qFhykJS- zqhgEhMY``a;sLMS44iUf=ZEsSxh0=~;O6M87I-zAF?nxAKiKkQPmx9C5`%zVx$RQt z4WTK0Uitlq5J}p%3m3kx1;Y6#I2&I0%!a(0sc_Ne-w(qphQ~BN!g-a|Pnp3HH*;n_ zrnoSSM+j_GmIfh*7p{@9y_A#m0kHwOdk=7P`(-A_p7UOE|?bhwP$M>6)g~^90VyEjpn_BsqE-U(F1hKo(#>MN+NK46vD`(QClq5z6g5~iXcEKST*g#Hf|yUYB|a)bF=(J!6qVcJD0$Ex z{Qm6#agYy~lge@KAlbBN4d9^%HC&q+AbW)CTwB>c z!+81IQr&eYM?&kM#nCyjyoV|@b)Vn%d4C9ndl-oYAv0t(qBs%WlucDJxDDG9sV#5d(`j6a z3Wfdm={sFS_p&sP*;pzF5EV>^EAW7fa_O%N+8m4*KB=;7a(!>^{QXA&#iIi%CT^Fz zmL)QnMz~kJRCwO{h?t7NH2TAtwj+b4%HWK+K8*~9t-aX6?diLI4Dki!nUn2hEzMGV zBC=$YO%+ITeMFZ9Sd-a%tjPSwu6RL~(-I_{1Ta~5`1>qMM7V;D3@I4+#2IS4mz&u( zAjHQ!@!Io-JaM6}QzQkh8c@kj@c6t@lAdo~SMlCZ-Y|nk@+L%YUAX(wrS*tJ;`7+%~c?^bxhb<0m zU!{=p=)2T-h5cZO;+vYV1xW^$0bz!CyrIWQZd^co`xiS0So}nq4pk{tAdWnfKWrhR zeSK2t^M=rJt<{x8(^MSP=i;|2fXMp&kbS3Qe8)Oi3s8c-4W8{a2%M)^a$U1gy-D$H z_*Y0-n+s7!`-3I3!b!1fXaQ)COq|_{*6gs*fw|k&rFOhG)4QWM0Un(iB+L--MH0x@ zEsqo5*iMKjwHu|y=+F8`fC}**KG?;YWBMtM%9w%jr~JZ&6@JL8H8MOcz5BHrV?&Z| zr8s0;@Z}?=E|X|BCun1cEiv4K1Czk`ut^5$rjkO7K@W~z3fFC$dAwKME6W7liE?#u zz}>L5^?$2GbLG@LIsw=D?i+st{4FzuE1NYzc?*53*hjZ{$A8s~aG=p^sDWR3YBl

UyL=j8H$V=T0{u2V<} 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 CjyMAV diff --git a/Makefile b/Makefile index 25349e1d..6fbf7b1b 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# This Makefile is written as generic as possible. +# This Make# This Makefile is written as generic as possible. # Setting the variables in .metadata.sh and creating the paths in the repo makes this work. # See more: https://github.com/golift/application-builder @@ -47,7 +47,7 @@ endef all: build # Prepare a release. Called in Travis CI. -release: clean macos arm windows linux_packages +release: clean macos windows linux_packages # Prepareing a release! mkdir -p $@ mv $(BINARY).*.macos $(BINARY).*.linux $@/ @@ -211,7 +211,8 @@ docker: --build-arg "VENDOR=$(VENDOR)" \ --build-arg "AUTHOR=$(MAINT)" \ --build-arg "BINARY=$(BINARY)" \ - --build-arg "GHREPO=$(GHREPO)" \ + --build-arg "IMPORT_PATH=$(IMPORT_PATH)" \ + --build-arg "SOURCE_URL=$(SOURCE_URL)" \ --build-arg "CONFIG_FILE=$(CONFIG_FILE)" \ --tag $(BINARY) . @@ -229,7 +230,8 @@ $(BINARY).rb: v$(VERSION).tar.gz.sha256 init/homebrew/$(FORMULA).rb.tmpl -e "s/{{SHA256}}/$(shell head -c64 $<)/g" \ -e "s/{{Desc}}/$(DESC)/g" \ -e "s%{{URL}}%$(URL)%g" \ - -e "s%{{GHREPO}}%$(GHREPO)%g" \ + -e "s%{{IMPORT_PATH}}%$(IMPORT_PATH)%g" \ + -e "s%{{SOURCE_PATH}}%$(SOURCE_PATH)%g" \ -e "s%{{CONFIG_FILE}}%$(CONFIG_FILE)%g" \ -e "s%{{Class}}%$(shell echo $(BINARY) | perl -pe 's/(?:\b|-)(\p{Ll})/\u$$1/g')%g" \ init/homebrew/$(FORMULA).rb.tmpl | tee $(BINARY).rb @@ -260,9 +262,9 @@ deps: install: man readme $(BINARY) @echo - Done Building! - @echo - Local installation with the Makefile is only supported on macOS. - @echo If you wish to install the application manually on Linux, check out the wiki: https://github.com/$(GHREPO)/wiki/Installation + @echo If you wish to install the application manually on Linux, check out the wiki: https://$(SOURCE_URL)/wiki/Installation @echo - Otherwise, build and install a package: make rpm -or- make deb - @echo See the Package Install wiki for more info: https://github.com/$(GHREPO)/wiki/Package-Install + @echo See the Package Install wiki for more info: https://$(SOURCE_URL)/wiki/Package-Install @[ "$(shell uname)" = "Darwin" ] || (echo "Unable to continue, not a Mac." && false) @[ "$(PREFIX)" != "" ] || (echo "Unable to continue, PREFIX not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) @[ "$(ETC)" != "" ] || (echo "Unable to continue, ETC not set. Use: make install PREFIX=/usr/local ETC=/usr/local/etc" && false) diff --git a/init/docker/Dockerfile b/init/docker/Dockerfile index 57eeb331..0321c55f 100644 --- a/init/docker/Dockerfile +++ b/init/docker/Dockerfile @@ -9,21 +9,21 @@ ARG BUILD_DATE=0 ARG COMMIT=0 ARG VERSION=unknown ARG BINARY=application-builder -ARG GHREPO=golift/application-builder +ARG IMPORT_PATH=github.com/golift/application-builder FROM golang:stretch as builder ARG ARCH ARG OS ARG BINARY -ARG GHREPO +ARG IMPORT_PATH -RUN mkdir -p $GOPATH/pkg/mod $GOPATH/bin $GOPATH/src/github.com/${GHREPO} +RUN mkdir -p $GOPATH/pkg/mod $GOPATH/bin $GOPATH/src/${IMPORT_PATH} RUN apt-get update \ && apt-get install -y curl \ && curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh -COPY . $GOPATH/src/github.com/${GHREPO} -WORKDIR $GOPATH/src/github.com/${GHREPO} +COPY . $GOPATH/src/${IMPORT_PATH} +WORKDIR $GOPATH/src/${IMPORT_PATH} RUN dep ensure --vendor-only \ && CGO_ENABLED=0 make ${BINARY}.${ARCH}.${OS} @@ -36,7 +36,8 @@ ARG COMMIT ARG VERSION ARG LICENSE=MIT ARG BINARY -ARG GHREPO +ARG IMPORT_PATH +ARG SOURCE_URL=http://github.com/golift/application-builder ARG URL=http://github.com/golift/application-builder ARG DESC=application-builder ARG VENDOR=golift @@ -46,19 +47,19 @@ ARG CONFIG_FILE=config.conf # Build-time metadata as defined at https://github.com/opencontainers/image-spec/blob/master/annotations.md LABEL org.opencontainers.image.created="${BUILD_DATE}" \ org.opencontainers.image.title="${BINARY}" \ - org.opencontainers.image.documentation="https://github.com/${GHREPO}/wiki/Docker" \ + org.opencontainers.image.documentation="${SOURCE_URL}/wiki/Docker" \ org.opencontainers.image.description="${DESC}" \ org.opencontainers.image.url="${URL}" \ org.opencontainers.image.revision="${COMMIT}" \ - org.opencontainers.image.source="https://github.com/${GHREPO}" \ + org.opencontainers.image.source="${SOURCE_URL}" \ org.opencontainers.image.vendor="${VENDOR}" \ org.opencontainers.image.authors="${AUTHOR}" \ org.opencontainers.image.architecture="${OS} ${ARCH}" \ org.opencontainers.image.licenses="${LICENSE}" \ org.opencontainers.image.version="${VERSION}" -COPY --from=builder /go/src/github.com/${GHREPO}/${BINARY}.${ARCH}.${OS} /image -COPY --from=builder /go/src/github.com/${GHREPO}/examples/${CONFIG_FILE}.example /etc/${BINARY}/${CONFIG_FILE} +COPY --from=builder /go/src/${IMPORT_PATH}/${BINARY}.${ARCH}.${OS} /image +COPY --from=builder /go/src/${IMPORT_PATH}/examples/${CONFIG_FILE}.example /etc/${BINARY}/${CONFIG_FILE} VOLUME [ "/etc/${BINARY}" ] ENTRYPOINT [ "/image" ] diff --git a/init/docker/hooks/build b/init/docker/hooks/build index 051c164b..3eb4e50e 100755 --- a/init/docker/hooks/build +++ b/init/docker/hooks/build @@ -28,7 +28,8 @@ for build in $BUILDS; do --build-arg "VENDOR=${VENDOR}" \ --build-arg "AUTHOR=${MAINT}" \ --build-arg "BINARY=${BINARY}" \ - --build-arg "GHREPO=${GHREPO}" \ + --build-arg "IMPORT_PATH=${IMPORT_PATH}" \ + --build-arg "SOURCE_URL=${SOURCE_URL}" \ --build-arg "CONFIG_FILE=${CONFIG_FILE}" \ --tag "${IMAGE_NAME}_${os}_${name}" \ --file ${DOCKERFILE_PATH} . diff --git a/init/homebrew/service.rb.tmpl b/init/homebrew/service.rb.tmpl index 85427ebc..39efcc04 100644 --- a/init/homebrew/service.rb.tmpl +++ b/init/homebrew/service.rb.tmpl @@ -1,10 +1,11 @@ # Homebrew Formula Template. Built by Makefile: `make fomula` # This is part of Application Builder. # https://github.com/golift/application-builder +# This file is used when FORMULA is set to 'service'. class {{Class}} < Formula desc "{{Desc}}" homepage "{{URL}}" - url "{{URL}}/archive/v{{Version}}.tar.gz" + url "{{SOURCE_PATH}}" sha256 "{{SHA256}}" head "{{URL}}" @@ -14,9 +15,9 @@ class {{Class}} < Formula def install ENV["GOPATH"] = buildpath - bin_path = buildpath/"src/github.com/{{GHREPO}}" + bin_path = buildpath/"src/{{IMPORT_PATH}}" # Copy all files from their current location (GOPATH root) - # to $GOPATH/src/github.com/{{GHREPO}} + # to $GOPATH/src/{{IMPORT_PATH}} bin_path.install Dir["*",".??*"] cd bin_path do system "dep", "ensure", "--vendor-only" @@ -49,7 +50,7 @@ class {{Class}} < Formula ProgramArguments #{bin}/#{name} - -c + --config #{etc}/#{name}/{{CONFIG_FILE}} RunAtLoad diff --git a/scripts/formula-deploy.sh b/scripts/formula-deploy.sh index a99b6521..843c5139 100755 --- a/scripts/formula-deploy.sh +++ b/scripts/formula-deploy.sh @@ -21,7 +21,7 @@ if [ -f "bitly_token" ]; then API=https://api-ssl.bitly.com/v4/bitlinks # Request payload. In single quotes with double quotes escaped. :see_no_evil: JSON='{\"domain\": \"bit.ly\",\"title\": \"${BINARY}.v${VERSION}-${ITERATION}.tgz\", \ - \"tags\": [\"${BINARY}\"], \"long_url\": \"https://codeload.github.com/${GHREPO}/tar.gz/v${VERSION}\"}' + \"tags\": [\"${BINARY}\"], \"long_url\": \"${SOURCE_PATH}\"}' # Request with headers and data. Using bash -c to hide token from bash -x in travis logs. OUT=$(bash -c "curl -s -X POST -H 'Content-type: application/json' ${API} -H \"\$( Date: Sun, 14 Jul 2019 23:03:10 -0700 Subject: [PATCH 2/4] fix head and makefile --- Makefile | 3 ++- init/homebrew/service.rb.tmpl | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 6fbf7b1b..21b3524e 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# This Make# This Makefile is written as generic as possible. +# This Makefile is written as generic as possible. # Setting the variables in .metadata.sh and creating the paths in the repo makes this work. # See more: https://github.com/golift/application-builder @@ -232,6 +232,7 @@ $(BINARY).rb: v$(VERSION).tar.gz.sha256 init/homebrew/$(FORMULA).rb.tmpl -e "s%{{URL}}%$(URL)%g" \ -e "s%{{IMPORT_PATH}}%$(IMPORT_PATH)%g" \ -e "s%{{SOURCE_PATH}}%$(SOURCE_PATH)%g" \ + -e "s%{{SOURCE_URL}}%$(SOURCE_URL)%g" \ -e "s%{{CONFIG_FILE}}%$(CONFIG_FILE)%g" \ -e "s%{{Class}}%$(shell echo $(BINARY) | perl -pe 's/(?:\b|-)(\p{Ll})/\u$$1/g')%g" \ init/homebrew/$(FORMULA).rb.tmpl | tee $(BINARY).rb diff --git a/init/homebrew/service.rb.tmpl b/init/homebrew/service.rb.tmpl index 39efcc04..ff8802d9 100644 --- a/init/homebrew/service.rb.tmpl +++ b/init/homebrew/service.rb.tmpl @@ -7,7 +7,7 @@ class {{Class}} < Formula homepage "{{URL}}" url "{{SOURCE_PATH}}" sha256 "{{SHA256}}" - head "{{URL}}" + head "{{SOURCE_URL}}" depends_on "go" => :build depends_on "dep" From 3aa69dff2abba8359a924a9edfd27e69ef6157dd Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 15 Jul 2019 00:08:17 -0700 Subject: [PATCH 3/4] fix gw and sw bug --- Gopkg.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 1b50da39..253fe36a 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,12 @@ [[projects]] - digest = "1:b414adbcdaa6d8a2f2dd02ad8cc94a57b8bb66480a443e68dc10e6d40540c358" + digest = "1:7f90b098b79fa5bac058ab82b1d9a2d3b26b24722415e7c6be015cb42c9aad08" name = "code.golift.io/unifi" packages = ["."] pruneopts = "UT" - revision = "184dbe828623689015fdfa2627f7f6810411b07e" - version = "v3.3.0" + revision = "45451f314f87140cdb5800c328ffee1e4557c213" + version = "v3.3.1" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761" From dd414f124c3f8dad6ddb8532129529673fca6b5a Mon Sep 17 00:00:00 2001 From: David Newhall II Date: Mon, 15 Jul 2019 00:17:16 -0700 Subject: [PATCH 4/4] One more library update --- Gopkg.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index 253fe36a..8238a21c 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,12 @@ [[projects]] - digest = "1:7f90b098b79fa5bac058ab82b1d9a2d3b26b24722415e7c6be015cb42c9aad08" + digest = "1:6a0be013a234fe00d3c080db2b887aee9cd6bc8f3f559b8b7a079150c34ba017" name = "code.golift.io/unifi" packages = ["."] pruneopts = "UT" - revision = "45451f314f87140cdb5800c328ffee1e4557c213" - version = "v3.3.1" + revision = "c998e559a9b52f7e7859de86e7f69b40582d3e37" + version = "v3.3.2" [[projects]] digest = "1:9f3b30d9f8e0d7040f729b82dcbc8f0dead820a133b3147ce355fc451f32d761"