Fix building fluentd images

.gitlab-ci.yml

@@ -32,7 +32,7 @@ build-master:
     - VERSION_5=`grep 'version="*"' fluentd/Dockerfile | cut -d '"' -f2`
     - IMAGE_5="$CI_REGISTRY_IMAGE/fluentd"
     - docker pull "$IMAGE_5":latest || true
-    - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":latest -t "$IMAGE_5":$VERSION_5 cache/
+    - docker build --cache-from "$IMAGE_5":latest -t "$IMAGE_5":latest -t "$IMAGE_5":$VERSION_5 fluentd/
     - chmod +x gitlab_test.sh
     - ./gitlab_test.sh
     - docker push "$IMAGE_1":$VERSION_1
@@ -74,7 +74,8 @@ build:
     - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
     - IMAGE="$CI_REGISTRY_IMAGE/fluentd"
     - docker pull "$IMAGE":latest || true
-    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME cache/
+    - docker build --cache-from "$IMAGE":latest -t "$IMAGE":$CI_COMMIT_REF_SLUG -t "$IMAGE":$CI_COMMIT_REF_NAME fluentd/
+    - docker tag "$IMAGE:$CI_COMMIT_REF_NAME" "$IMAGE:latest"
     - chmod +x gitlab_test.sh
     - ./gitlab_test.sh
   except: