Use tagging correctly

.gitlab-ci.yml

@@ -16,7 +16,7 @@ before_script:
   stage: build
   script:
     - docker pull $IMAGE:latest || true
-    - docker build --build-arg clamsmtp_version=$CLAMSMTP_VERSION --cache-from $IMAGE:latest --tag $IMAGE:$CI_COMMIT_SHA --tag $IMAGE:latest -f $DOCKERFILE .
+    - docker build --build-arg version=$VERSION --cache-from $IMAGE:latest --tag $IMAGE:$CI_COMMIT_SHA --tag $IMAGE:latest -f $DOCKERFILE .
     - docker push $IMAGE:$CI_COMMIT_SHA
     - docker push $IMAGE:latest
   tags:
@@ -54,23 +54,10 @@ build-clamsmtp:
   variables:
     IMAGE: communicatio/clamsmtp
     DOCKERFILE: Dockerfile.clamsmtp
-
-tag-postfix:
-  variables:
-    IMAGE: communicatio/postfix
-  <<: *docker-tag
-
-tag-dovecot:
-  variables:
-    IMAGE: communicatio/dovecot
-  <<: *docker-tag
-
-tag-rspamd:
-  variables:
-    IMAGE: communicatio/rspamd
-  <<: *docker-tag
+    VERSION: $CLAMSMTP_VERSION
 
 tag-clamsmtp:
   variables:
     IMAGE: communicatio/clamsmtp
+    VERSION: $CLAMSMTP_VERSION
   <<: *docker-tag

Dockerfile.clamsmtp

@@ -4,8 +4,8 @@ LABEL maintainer="Alexander Kahl <ak@communicatio.com>"
 ENTRYPOINT ["/docker-entrypoint"]
 EXPOSE 10025/tcp
 
-ARG clamsmtp_version
-RUN dnf install -y clamsmtp-$clamsmtp_version \
+ARG version
+RUN dnf install -y clamsmtp-$version \
  && dnf clean all
 
 COPY clamsmtp/clamsmtpd.conf /etc/clamsmtpd.conf