Browse Source

Update everything and use pre-built binaries for some

master
Andreas Linz 2 months ago
parent
commit
122c381b2f
No known key found for this signature in database GPG Key ID: F5B03FDA5660FA85
8 changed files with 14 additions and 55 deletions
  1. +1
    -1
      build/caddy/Makefile
  2. +0
    -1
      build/gitea/.gitignore
  3. +3
    -22
      build/gitea/Makefile
  4. +7
    -15
      build/grafana/Makefile
  5. +0
    -13
      build/grafana/mod.patch
  6. +1
    -1
      build/node_exporter/Makefile
  7. +1
    -1
      build/pgweb/Makefile
  8. +1
    -1
      build/prometheus/Makefile

+ 1
- 1
build/caddy/Makefile View File

@ -1,6 +1,6 @@
.PHONY: clean
VERSION :=v1.0.3
VERSION :=v1.0.5
CADDY_SRC :=caddy-src-$(VERSION)
all: caddy

+ 0
- 1
build/gitea/.gitignore View File

@ -1,2 +1 @@
/gitea
/gitea-src*/

+ 3
- 22
build/gitea/Makefile View File

@ -1,30 +1,11 @@
.PHONY: clean
VERSION :=v1.9.4
GITEA_SRC :=gitea-src-$(VERSION)
GOPATH :=$(shell pwd)/$(GITEA_SRC)/.go
GITEA_BUILD_TAGS:=bindata
VERSION:=1.13.0
all: gitea
gitea: $(GITEA_SRC) checkout-version $(GOPATH) $(GOPATH)/bin/go-bindata
cd $(GOPATH)/src/code.gitea.io/gitea\
&& PATH=$(GOPATH)/bin:$$PATH TAGS=$(GITEA_BUILD_TAGS) make GO111MODULE=on generate build
cp $(GITEA_SRC)/$@ $@
$(GOPATH): $(GITEA_SRC)
mkdir -p $@/src/code.gitea.io
ln -sf $(shell pwd)/$(GITEA_SRC) $(GOPATH)/src/code.gitea.io/gitea
$(GOPATH)/bin/go-bindata: $(GOPATH)
GO111MODULE=on go get -u github.com/go-bindata/go-bindata/go-bindata
$(GITEA_SRC):
git clone https://github.com/go-gitea/gitea.git $@
checkout-version: $(GITEA_SRC)
cd $(GITEA_SRC) && git checkout --force --quiet $(VERSION)
gitea:
@curl -o $@ -Lf 'https://github.com/go-gitea/gitea/releases/download/v$(VERSION)/gitea-$(VERSION)-linux-amd64'
clean:
rm -f gitea
rm -rf gitea-*

+ 7
- 15
build/grafana/Makefile View File

@ -1,23 +1,15 @@
.PHONY: grafana clean
VERSION :=v6.4.3
GRAFANA_SRC :=grafana-src-$(VERSION)
VERSION:=7.3.5
all: grafana
grafana: $(GRAFANA_SRC) checkout-version
cd $(GRAFANA_SRC) && git apply ../mod.patch && make build-server
mkdir -p $@
cp -r $(GRAFANA_SRC)/bin/linux-amd64 $@/bin
cp -r $(GRAFANA_SRC)/conf $@/
cp -r $(GRAFANA_SRC)/public $@/
$(GRAFANA_SRC):
git clone https://github.com/grafana/grafana.git $@
checkout-version: $(GRAFANA_SRC)
cd $(GRAFANA_SRC) && git checkout --force --quiet $(VERSION)
grafana:
@curl -Lsf 'https://dl.grafana.com/oss/release/grafana-$(VERSION).linux-amd64.tar.gz' | tar -xvzf-
@mkdir -p $@
@cp -r grafana-$(VERSION)/bin $@/bin
@cp -r grafana-$(VERSION)/conf $@/
@cp -r grafana-$(VERSION)/public $@/
clean:
rm -rf grafana*

+ 0
- 13
build/grafana/mod.patch View File

@ -1,13 +0,0 @@
diff --git a/go.mod b/go.mod
index 1c90cfe4fa..3223ff3b27 100644
--- a/go.mod
+++ b/go.mod
@@ -72,7 +72,7 @@ require (
golang.org/x/net v0.0.0-20190724013045-ca1201d0de80
golang.org/x/oauth2 v0.0.0-20190319182350-c85d3e98c914
golang.org/x/sync v0.0.0-20190423024810-112230192c58
- golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898
gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
gopkg.in/asn1-ber.v1 v1.0.0-20181015200546-f715ec2f112d // indirect
gopkg.in/ini.v1 v1.46.0

+ 1
- 1
build/node_exporter/Makefile View File

@ -1,6 +1,6 @@
.PHONY: clean
VERSION :=v0.18.1
VERSION :=v1.0.1
NODE_EXPORTER_SRC :=node-exporter-src-$(VERSION)
all: node_exporter

+ 1
- 1
build/pgweb/Makefile View File

@ -1,6 +1,6 @@
.PHONY: clean
VERSION:=0.11.3
VERSION:=0.11.7
all: pgweb

+ 1
- 1
build/prometheus/Makefile View File

@ -1,6 +1,6 @@
.PHONY: clean
VERSION :=v2.11.1
VERSION :=v2.23.0
PROMETHEUS_SRC :=prometheus-src-$(VERSION)
all: prometheus

Loading…
Cancel
Save