message: introducing new variable s3-images as we don't need any tags for saving and loading from s3
diff: @@ -120,6 +120,7 @@ images := centos7 \
  # base-images is a variable that will be constantly filled with all base image there are
  base-images += $(images)
  +s3-images += $(images)
  # List with all images prefixed with `build/`. Which are the commands to actually build images
  build-images = $(foreach image,$(images),build/$(image))
  @@ -197,6 +198,7 @@ $(build-phpimages): build/commons
  touch $@
  base-images += $(phpimages)
  +s3-images += php
  build/php__5.6-fpm build/php__7.0-fpm build/php__7.1-fpm build/php__7.2-fpm: images/commons
  build/php__5.6-cli: build/php__5.6-fpm
  @@ -234,6 +236,7 @@ $(build-solrimages): build/commons
  touch $@
  base-images += $(solrimages)
  +s3-images += solr
  build/solr__5.5 build/solr__6.6: images/commons
  build/solr__5.5-drupal: build/solr__5.5
  @@ -267,6 +270,7 @@ $(build-nodeimages): build/commons
  touch $@
  base-images += $(nodeimages)
  +s3-images += node
  build/node__9 build/node__8 build/node__6: images/commons images/node/Dockerfile
  build/node__9-builder: build/node__9 images/node/builder/Dockerfile
  @@ -307,6 +311,7 @@ services := api \
  drush-alias
  service-images += $(services)
  +
  build-services = $(foreach image,$(services),build/$(image))
  # Recepie for all building service-images
  @@ -357,6 +362,9 @@ build/tests:
  $(call docker_build,$(image),$(image)/Dockerfile,$(image))
  touch $@
  service-images += tests
  +
  +s3-images += $(service-images)
  +
  #######
  ####### Commands
  #######
  @@ -519,7 +527,7 @@ $(publish-amazeeiolagoon-serviceimages):
  $(eval image = $(subst __,:,$(image)))
  $(call docker_publish_amazeeiolagoon_serviceimages,$(image))
  -s3-save = $(foreach image,$(base-images) $(service-images),[s3-save]-$(image))
  +s3-save = $(foreach image,$(s3-images),[s3-save]-$(image))
  # save all images to s3
  .PHONY: s3-save
  s3-save: $(s3-save)
  @@ -531,7 +539,7 @@ $(s3-save):
  $(eval image = $(subst __,:,$(image)))
  docker save $(CI_BUILD_TAG)/$(image) | gzip -9 | aws s3 cp - s3://lagoon-images/$(image).tar.gz
  -s3-load = $(foreach image,$(base-images) $(service-images),[s3-load]-$(image))
  +s3-load = $(foreach image,$(s3-images),[s3-load]-$(image))
  # save all images to s3
  .PHONY: s3-load
  s3-load: $(s3-load)
  