Using env variables works now. Separated docker into build and run steps.

Change-Id: Ic62a268075017a9cffe64f1bfca8b860e12bca67