Merge pull request #597 from ilteriseroglu-ty/fix-xbuilds
fix Makefile and Dockerfile to build on latest go versions