From 2bbffffcfc875558eddf590b3185b968ff969ede Mon Sep 17 00:00:00 2001
From: Andrey Meshkov <am@adguard.com>
Date: Fri, 10 Jul 2020 14:57:53 +0300
Subject: [PATCH] Fix project name, update README
---
.goreleaser.yml | 4 +++-
Makefile | 11 +++++------
README.md | 8 ++++++++
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/.goreleaser.yml b/.goreleaser.yml
index f698bcf1..b2e11b09 100644
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -1,3 +1,5 @@
+project_name: AdGuardHome
+
env:
- GO111MODULE=on
- GOPROXY=https://goproxy.io
@@ -80,7 +82,7 @@ snapcrafts:
license: GPL-3.0
apps:
adguard-home:
- args: -w ${SNAP_DATA} --no-check-update
+ command: AdGuardHome -w $SNAP_DATA --no-check-update
plugs: [ network-bind ]
daemon: simple
diff --git a/Makefile b/Makefile
index 7de43f3a..6c0bb5fa 100644
--- a/Makefile
+++ b/Makefile
@@ -43,9 +43,7 @@ endif
# Version properties
COMMIT=$(shell git rev-parse --short HEAD)
TAG_NAME=$(shell git describe --abbrev=0)
-
-# Remove leading "v" from the tag name
-RELEASE_VERSION=$(TAG_NAME:v%=%)
+RELEASE_VERSION=$(TAG_NAME)
SNAPSHOT_VERSION=$(RELEASE_VERSION)-SNAPSHOT-$(COMMIT)
# Set proper version
@@ -72,7 +70,8 @@ ifndef DOCKER_TAGS
DOCKER_TAGS := $(DOCKER_TAGS) --tag $(DOCKER_IMAGE_NAME):beta
endif
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
@@ -171,12 +170,12 @@ define write_version_file
# Variables for CI
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
rm -f $(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_url\": \"https://github.com/AdguardTeam/AdGuardHome/releases\"," >> $(DIST_DIR)/version.json
echo " \"selfupdate_min_version\": \"v0.0\"," >> $(DIST_DIR)/version.json
diff --git a/README.md b/README.md
index 602c1be0..ab8f306d 100644
--- a/README.md
+++ b/README.md
@@ -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-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
* `scripts/translations`