Add makefile for image build/push
Add test target to Makefile
Correct graphite's retention rules