fixes

.gitlab-ci.yml

@@ -11,8 +11,12 @@ variables:
   CONTAINER_TEST_X86_IMAGE: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-x86
   CONTAINER_RELEASE_IMAGE: $CI_REGISTRY_IMAGE:latest
 
-before_script:
-  - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+.dockertask:
+  before_script:
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+  dependencies: []
+  tags: 
+    - docker
 
 fetch_source:
   stage: fetch
@@ -29,18 +33,22 @@ fetch_source:
   stage: build
   dependencies:
     - fetch_source
-
-build-x86:
-  extends: .build
   tags: 
     - docker
+
+build-x86:
+  extends:
+    - .dockertask
+    - .build
   script:
     - cd go-cqhttp
     - docker build --pull -t $CONTAINER_TEST_X86_IMAGE .
     - docker push $CONTAINER_TEST_X86_IMAGE
 
 build-arm:
-  extends: .build
+  extends:
+    - .dockertask
+    - .build
   tags: 
     - docker-arm
   script:
@@ -49,10 +57,9 @@ build-arm:
     - docker push $CONTAINER_TEST_ARM_IMAGE
 
 combine:
+  extends:
+    - .dockertask
   stage: combine
-  dependencies: []
-  tags:
-    - docker
   script:
     - docker pull $CONTAINER_TEST_X86_IMAGE
     - docker pull $CONTAINER_TEST_ARM_IMAGE
@@ -61,9 +68,8 @@ combine:
 
 deploy_latest:
   stage: deploy
-  dependencies: []
-  tags: 
-    - docker
+  extends:
+    - .dockertask
   script:
     - docker pull $CONTAINER_TEST_IMAGE
     - docker tag $CONTAINER_TEST_IMAGE $CONTAINER_RELEASE_IMAGE