REM obsolete dockerfiles

Also removes the docker-compose template as we were not saving any space with it.

Makefile

@@ -33,8 +33,9 @@ clean: ## cleans up the repository
 	/bin/rm -rf $(BUILDDIR)
 	/bin/rm -rf $(PKGDIR)
 	/bin/rm -rf $(DATADIR)
+	/bin/rm -rf ./.state
 
-test: vet ## runs unit tests 
+test: vet ## runs unit tests
 	go test -v ./...
 
 format: ## formats the code
@@ -45,6 +46,8 @@ vet: ## examines the go code with `go vet`
 
 up: $(addprefix up/,$(DISTRIBUTIONS)) ## start agents for all distributions
 up/%: build ## starts the agent for a specific distribution
+	mkdir -p .state
+	touch .state/$*
 	docker-compose --project-name=tactycal up agent$*
 
 $(PKGDIR): $(addprefix $(PKGDIR)/,$(PACKAGE_TYPE)) ## creates artifacts for all distributions

client.go

@@ -121,7 +121,9 @@ func (c *Client) SendPackageList(packages []*packageLookup.Package) error {
 		}
 
 		if errCode.Error == ErrorCodeInvalidToken {
-			c.state.Reset()
+			if err := c.state.Reset(); err != nil {
+				return err
+			}
 			return fmt.Errorf("Token was reported as invalid. Perhaps the host was deleted. New host ID will be assigned to this machine.")
 		}
 

docker-compose.yml

@@ -1,54 +1,61 @@
 version: "2"
 services:
   agentdebian:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.debian
+    image: debian:jessie
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/debian:/var/opt/tactycal/state
     environment:
       - LABEL=debianenv
 
   agentubuntu:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.ubuntu
+    image: ubuntu:latest
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/ubuntu:/var/opt/tactycal/state
     environment:
       - LABEL=ubuntuenv
 
   agentrhel:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.rhel
+    image: richxsl/rhel7
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/rhel:/var/opt/tactycal/state
 
   agentcentos:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.centos
-
+    image: centos:7
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/centos:/var/opt/tactycal/state
+
   agentopensuse:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.opensuse
+    image: opensuse:42.2
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/opensuse:/var/opt/tactycal/state
 
   agentsles:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.sles
-
+    image: gitlab.3fs.si:4567/tactycal/tactycal:sles12sp2
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/sles:/var/opt/tactycal/state
+
   agentamzn:
-    extends:
-      file: docker-compose.tmpl
-      service: agent
-    build:
-      dockerfile: Dockerfile.amzn
+    image: amazonlinux:2016.09
+    command: /usr/local/bin/tactycal -d
+    volumes:
+      - ./build/usr/bin/tactycal:/usr/local/bin/tactycal
+      - ./my_conf.conf:/etc/tactycal/agent.conf
+      - .state/amzn:/var/opt/tactycal/state