fix(dockerfile.emg): use `ksmanis/stage3` until `gentoo/stage3` upgraded

Imran Iqbalrequested to merge
myii/salt-image-builder:fix/ensure-correct-tag-for-gentoo-builds into master

This involves reverting commit 1c11a744, since that led to the wrong tags being pushed to Docker Hub, ksmanis-* instead of gentoo-*.

@ijansky Unfortunately, the method used in !73 (merged) meant that we didn't end up with the correctly named images in Docker Hub, i.e.:

  • saltimages/salt-3002.2-py3/ksmanis-stage3-latest
  • saltimages/salt-3001.4-py3/ksmanis-stage3-latest
  • saltimages/salt-3000.6-py3/ksmanis-stage3-latest
  • saltimages/salt-3002.2-py3/ksmanis-stage3-systemd
  • saltimages/salt-3001.4-py3/ksmanis-stage3-systemd
  • saltimages/salt-3000.6-py3/ksmanis-stage3-systemd

Note, I've deleted these images.

I've decided that a simple override in Dockerfile.emg will be the easiest to work with for the time being. This method has reverted the changes to both .gitlab-ci.yml and .travis.yml. It means that we would only have to apply the following patch when the upstream Gentoo images are updated:

-# Use `ksmanis/stage3` until `gentoo/stage3` is upgraded
+ARG DISTRO_NAME
 ARG DISTRO_VERSION
-FROM ksmanis/stage3:$DISTRO_VERSION
+FROM $DISTRO_NAME:$DISTRO_VERSION

Merge request reports