Merge branch 'rule_change' into 'master'

Rule change

See merge request !8

.gitlab-ci.yml

@@ -14,38 +14,35 @@ stages:
     - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
     - /kaniko/executor --context $CI_PROJECT_DIR --context-sub-path "$DIRECTORY" --dockerfile "$CI_PROJECT_DIR/$DIRECTORY/Dockerfile" --destination "$CI_REGISTRY_IMAGE/$IMAGE_NAME" --build-arg "tag=$TAG" --skip-unused-stages 
 
-.job_other:
-  rules:
-    - if: '$CI_COMMIT_BRANCH != "master"'
-      
-.job_master:
-  rules:
-    - if: '$CI_COMMIT_BRANCH == "master"'
-
 build_standalone_base:
   extends:
     - .build
-    - .job_other
   stage: build:docker_base
   variables:
     TAG: ${CI_COMMIT_REF_SLUG}
     DIRECTORY: xcache-standalone/base/dockerfile/
     IMAGE_NAME: standalone/base:${CI_COMMIT_REF_SLUG}
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      changes: 
+        - xcache-standalone/base/dockerfile/
 
 build_standalone_base_master:
   extends:
     - .build
-    - .job_master
   stage: build:docker_base
   variables:
     TAG: ""
     DIRECTORY: xcache-standalone/base/dockerfile/
     IMAGE_NAME: standalone/base
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      changes: 
+        - xcache-standalone/base/dockerfile/
 
 build_standalone_token:
   extends:
     - .build
-    - .job_other
   stage: build:docker_standalone
   needs: 
     - build_standalone_base
@@ -53,11 +50,14 @@ build_standalone_token:
     TAG: ${CI_COMMIT_REF_SLUG}
     DIRECTORY: xcache-standalone/token/dockerfile/
     IMAGE_NAME: standalone/token:${CI_COMMIT_REF_SLUG}
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+      changes: 
+        - xcache-standalone/token/dockerfile/
 
 build_standalone_token_master:
   extends:
     - .build
-    - .job_master
   stage: build:docker_standalone
   needs: 
     - build_standalone_base_master
@@ -65,3 +65,7 @@ build_standalone_token_master:
     TAG: ""
     DIRECTORY: xcache-standalone/token/dockerfile/
     IMAGE_NAME: standalone/token
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      changes: 
+        - xcache-standalone/token/dockerfile/