Dynamically retrieve docker image name/version

[src/xds/xds-server.git] / Makefile

diff --git a/Makefile b/Makefile
index 236a415..1817315 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 # Makefile used to build XDS daemon Web Server
 
 # Application Version
-VERSION := 0.1.0
+VERSION := 0.3.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.28
@@ -14,7 +14,8 @@ ifeq ($(origin SUB_VERSION), undefined)
        ifneq ($(SUB_VERSION), )
                VERSION := $(firstword $(subst -, ,$(SUB_VERSION)))
                SUB_VERSION := $(word 2,$(subst -, ,$(SUB_VERSION)))
-       else
+       endif
+       ifeq ($(SUB_VERSION), )
                SUB_VERSION := $(shell git rev-parse --short HEAD)
                ifeq ($(SUB_VERSION), )
                        SUB_VERSION := unknown-dev
@@ -30,12 +31,12 @@ ifneq ($(origin INSTALL_WEBAPP_DIR), undefined)
        DESTDIR_WWW := $(INSTALL_WEBAPP_DIR)
 endif
 
-# Configurable variables for installation (default /usr/local/...)
+# Configurable variables for installation (default /opt/AGL/...)
 ifeq ($(origin DESTDIR), undefined)
-       DESTDIR := /usr/local/bin
+       DESTDIR := /opt/AGL/xds/server
 endif
 ifeq ($(origin DESTDIR_WWW), undefined)
-       DESTDIR_WWW := $(DESTDIR)/www-xds-server
+       DESTDIR_WWW := $(DESTDIR)/www
 endif
 
 HOST_GOOS=$(shell go env GOOS)
@@ -84,7 +85,7 @@ all: tools/syncthing build
 build: vendor xds webapp
 
 xds: scripts tools/syncthing/copytobin
-       @echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION))";
+       @echo "### Build XDS server (version $(VERSION), subversion $(SUB_VERSION), $(BUILD_MODE))";
        @cd $(ROOT_SRCDIR); $(BUILD_ENV_FLAGS) go build $(VERBOSE_$(V)) -i -o $(LOCAL_BINDIR)/xds-server$(EXT) -ldflags "$(GORELEASE) -X main.AppVersion=$(VERSION) -X main.AppSubVersion=$(SUB_VERSION)" .
 
 test: tools/glide
@@ -108,7 +109,7 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-       rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist
+       rm -rf $(LOCAL_BINDIR) $(ROOT_SRCDIR)/tools glide.lock vendor webapp/node_modules webapp/dist webapp/assets/xds-agent-tarballs/*.zip
 
 webapp: webapp/install
        (cd webapp && gulp build)
@@ -129,7 +130,7 @@ conffile:
        cat config.json.in \
                | sed -e s,"webapp/dist","$(DESTDIR_WWW)",g \
                | sed -e s,"\./bin","",g \
-                > $(DESTDIR)/config.json
+                > $(DESTDIR)/config.json.in
 
 .PHONY: install
 install:
@@ -141,18 +142,23 @@ install:
        mkdir -p $(DESTDIR_WWW) \
                && cp -a webapp/dist/* $(DESTDIR_WWW)
 
-.PHONY: package
-package: clean
+.PHONY: _package
+_package: clean
        make -f $(ROOT_SRCDIR)/Makefile all install  DESTDIR=$(PACKAGE_DIR)/xds-server
-       make -f $(ROOT_SRCDIR)/Makefile conffile  DESTDIR=$(PACKAGE_DIR)/xds-server DESTDIR_WWW=www-xds-server
+       make -f $(ROOT_SRCDIR)/Makefile conffile  DESTDIR=$(PACKAGE_DIR)/xds-server DESTDIR_WWW=www
+       cp -r $(ROOT_SRCDIR)/conf.d $(PACKAGE_DIR)/xds-server
+       rm -f $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE)
        (cd $(PACKAGE_DIR) && zip -r $(ROOT_SRCDIR)/$(PACKAGE_ZIPFILE) ./xds-server)
 
-.PHONY: package-all
-package-all:
+# On support Linux for now
+.PHONY: package
+package:
        @echo "# Build linux amd64..."
-       GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
-       @echo "# Build windows amd64..."
-       GOOS=windows GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile package
+       GOOS=linux GOARCH=amd64 RELEASE=1 make -f $(ROOT_SRCDIR)/Makefile _package
+       make -f $(ROOT_SRCDIR)/Makefile clean
+
+.PHONY: package-all
+package-all: package
 
 vendor: tools/glide glide.yaml
        $(LOCAL_TOOLSDIR)/glide install --strip-vendor