a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix project name, update README

This commit is contained in:
Andrey Meshkov 2020-07-10 14:57:53 +03:00
parent 632a47d56f
commit 2bbffffcfc
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.goreleaser.yml
View File

@ -1,3 +1,5 @@
project_name: AdGuardHome
env: env:
- GO111MODULE=on - GO111MODULE=on
- GOPROXY=https://goproxy.io - GOPROXY=https://goproxy.io
@ -80,7 +82,7 @@ snapcrafts:
license: GPL-3.0 license: GPL-3.0
apps: apps:
adguard-home: adguard-home:
args: -w ${SNAP_DATA} --no-check-update command: AdGuardHome -w $SNAP_DATA --no-check-update
plugs: [ network-bind ] plugs: [ network-bind ]
daemon: simple daemon: simple

11
Makefile
View File

@ -43,9 +43,7 @@ endif
# Version properties # Version properties
COMMIT=$(shell git rev-parse --short HEAD) COMMIT=$(shell git rev-parse --short HEAD)
TAG_NAME=$(shell git describe --abbrev=0) TAG_NAME=$(shell git describe --abbrev=0)
RELEASE_VERSION=$(TAG_NAME)
# Remove leading "v" from the tag name
RELEASE_VERSION=$(TAG_NAME:v%=%)
SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT) SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
# Set proper version # Set proper version
@ -72,7 +70,8 @@ ifndef DOCKER_TAGS
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta
endif endif
ifeq ($(CHANNEL),edge) ifeq ($(CHANNEL),edge)
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):edge # Overwrite the "version" tag when we push to the edge channel
DOCKER_TAGS := --tag $(DOCKER_IMAGE_NAME):edge
endif endif
endif endif
@ -171,12 +170,12 @@ define write_version_file
# Variables for CI # Variables for CI
rm -f $(DIST_DIR)/version.txt rm -f $(DIST_DIR)/version.txt
echo "version=v$(version)" > $(DIST_DIR)/version.txt echo "version=$(version)" > $(DIST_DIR)/version.txt
# Prepare the version.json file # Prepare the version.json file
rm -f $(DIST_DIR)/version.json rm -f $(DIST_DIR)/version.json
echo "{" >> $(DIST_DIR)/version.json echo "{" >> $(DIST_DIR)/version.json
echo " \"version\": \"v$(version)\"," >> $(DIST_DIR)/version.json echo " \"version\": \"$(version)\"," >> $(DIST_DIR)/version.json
echo " \"announcement\": \"AdGuard Home $(version) is now available!\"," >> $(DIST_DIR)/version.json echo " \"announcement\": \"AdGuard Home $(version) is now available!\"," >> $(DIST_DIR)/version.json
echo " \"announcement_url\": \"https://github.com/AdguardTeam/AdGuardHome/releases\"," >> $(DIST_DIR)/version.json echo " \"announcement_url\": \"https://github.com/AdguardTeam/AdGuardHome/releases\"," >> $(DIST_DIR)/version.json
echo " \"selfupdate_min_version\": \"v0.0\"," >> $(DIST_DIR)/version.json echo " \"selfupdate_min_version\": \"v0.0\"," >> $(DIST_DIR)/version.json

8
README.md
View File

@ -181,6 +181,14 @@ Run `make snapshot` or `make release` to build all AdGuard distrs.
* Run `make docker` to build the Docker image locally. * Run `make docker` to build the Docker image locally.
* Run `make docker-multi-arch` to build the multi-arch Docker image (the one that we publish to Docker Hub). * Run `make docker-multi-arch` to build the multi-arch Docker image (the one that we publish to Docker Hub).
Please note, that we're using [Docker Buildx](https://docs.docker.com/buildx/working-with-buildx/) to build our official image.
You may need to prepare before using these builds:
* (Linux-only) Install Qemu: `docker run --rm --privileged multiarch/qemu-user-static --reset -p yes --credential yes`
* Prepare builder: `docker buildx create --name buildx-builder --driver docker-container --use`
### Resources that we update periodically ### Resources that we update periodically
* `scripts/translations` * `scripts/translations`