From 6cd50f759c4a792aca5180faa30eda961dbd8b11 Mon Sep 17 00:00:00 2001
From: ErickSkrauch <erickskrauch@yandex.ru>
Date: Tue, 5 Nov 2019 15:27:07 +0300
Subject: [PATCH] Fix gitlab-ci configuration

---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a4354f7..1b56a02 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,6 +4,7 @@ stages:
   - prepare
   - testing
   - build
+  - cleanup
 
 variables:
   APP_IMAGE_NAME: "$CI_REGISTRY_IMAGE/app"
@@ -103,8 +104,6 @@ Codeception:
 Docker images:
   stage: build
   image: docker:19.03.2
-  services:
-    - docker:dind
   before_script:
     - *defineVars
     - *dockerLogin
@@ -143,12 +142,30 @@ Docker images:
       -t "$DB_VERSIONED_IMAGE_NAME"
       -t "$DB_LATEST_IMAGE_NAME" .
     # Push images to the registry
-    - docker push $APP_IMAGE_VERSIONED_NAME
-    - docker push $APP_IMAGE_LATEST_NAME
-    - docker push $WEB_IMAGE_VERSIONED_NAME
-    - docker push $WEB_IMAGE_LATEST_NAME
-    - docker push $DB_IMAGE_VERSIONED_NAME
-    - docker push $DB_IMAGE_LATEST_NAME
+    - docker push $APP_VERSIONED_IMAGE_NAME
+    - docker push $APP_LATEST_IMAGE_NAME
+    - docker push $WEB_VERSIONED_IMAGE_NAME
+    - docker push $WEB_LATEST_IMAGE_NAME
+    - docker push $DB_VERSIONED_IMAGE_NAME
+    - docker push $DB_LATEST_IMAGE_NAME
+  only:
+    - master
+    - tags
+
+#################
+# Cleanup stage #
+#################
+
+cleanup:
+  stage: cleanup
+  image: docker:19.03.2
+  variables:
+    GIT_STRATEGY: none
+  script:
+    - docker rmi "$APP_LATEST_IMAGE_NAME" "$APP_VERSIONED_IMAGE_NAME" || true
+    - docker rmi "$WEB_LATEST_IMAGE_NAME" "$WEB_VERSIONED_IMAGE_NAME" || true
+    - docker rmi "$DB_LATEST_IMAGE_NAME" "$DB_VERSIONED_IMAGE_NAME" || true
+  when: always
   only:
     - master
     - tags