Remove "docker" phrase

.gitlab-ci.yml

@@ -26,7 +26,7 @@
     echo
     echo
 
-.docker_build_template: &docker_build_template
+.image_build_template: &image_build_template
   stage: build
   before_script:
     - *debug_information
@@ -73,16 +73,16 @@ default:
 # Stage: build
 # ============
 #
-# Builds or updates CI test docker image
-# There are 2 moments in which we (re)build the docker image. If some files are
+# Builds or updates CI test container image
+# There are 2 moments in which we (re)build the container image. If some files are
 # changed, or when it needs to be done manually. There is no *or* in "only" or
 # "rules", so we have two jobs with different rules instead. Write
 # "REBUILD_CONTAINER" in your commit message to force rebuilding the container.
 
 ci-test-image-update:
-  <<: *docker_build_template
+  <<: *image_build_template
   rules::
-    # Automatically rebuild the docker container if this file, the Dockerfile,
+    # Automatically rebuild the container image if this file, the Dockerfile,
     # the installed requirements or the kaniko template change
     - changes:
         - .gitlab-ci.yml
@@ -445,10 +445,10 @@ terminate-droplet:
     name: $CI_COMMIT_REF_SLUG
     action: stop
 
-# Deletes a container once a branch is deleted.
+# Deletes a container image once a branch is deleted.
 # Careful! When you run this step manually, you might have to trigger container
-# re-creation as well
-delete-container:
+# image re-build as well
+delete-image:
   stage: build
   when: manual
   variables:
@@ -457,7 +457,7 @@ delete-container:
     - *debug_information
     - "curl --request DELETE --header \"PRIVATE-TOKEN: ${CLEANER_TOKEN}\" https://open.greenhost.net/api/v4/projects/openappstack%2Fopenappstack/registry/repositories/2/tags/${CI_COMMIT_REF_SLUG}"
   environment:
-    name: containers/$CI_COMMIT_REF_SLUG
+    name: image/$CI_COMMIT_REF_SLUG
     action: stop
 
 # We need one job that run every time (without any `only:` limitation).