From cb3c793cbcd91d82f6c3d9d176b8b64b2dde1740 Mon Sep 17 00:00:00 2001
From: Ameer Hamza <hello@ahkhan.me>
Date: Sun, 19 Mar 2023 14:40:04 +0800
Subject: [PATCH] Added support to build images for ubuntu-18 and ubuntu-20.

---
 .gitlab-ci.yml | 52 +++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 243a104..e94c7f3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,50 @@
-variables:
-  UBUNTU_VER: "22.04"
-
-build:
+build_22:
+  variables:
+    UBUNTU_VER: "22.04"
+  image: docker:23.0.1
+  stage: build
+  rules:
+    - changes:
+      - Dockerfile
+      - scripts/**/*
+  script:
+    - docker buildx create --use default
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker buildx build .  
+      -f Dockerfile
+      --build-arg UBUNTU_VER=$UBUNTU_VER
+      -t $CI_REGISTRY/docker/ubuntu/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"`
+      -t $CI_REGISTRY/docker/ubuntu/ubuntu-$UBUNTU_VER:latest
+      -t $CI_REGISTRY/docker/ubuntu:$UBUNTU_VER
+      -t $CI_REGISTRY/docker/ubuntu:latest
+      --platform linux/amd64,linux/arm64,linux/arm/v7
+      --push --provenance false
+
+build_20:
+  variables:
+    UBUNTU_VER: "20.04"
+  image: docker:23.0.1
+  stage: build
+  rules:
+    - changes:
+      - Dockerfile
+      - scripts/**/*
+  script:
+    - docker buildx create --use default
+    - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+    - docker buildx build .  
+      -f Dockerfile
+      --build-arg UBUNTU_VER=$UBUNTU_VER
+      -t $CI_REGISTRY/docker/ubuntu/ubuntu-$UBUNTU_VER:`date "+%Y-%m-%d"`
+      -t $CI_REGISTRY/docker/ubuntu/ubuntu-$UBUNTU_VER:latest
+      -t $CI_REGISTRY/docker/ubuntu:$UBUNTU_VER
+      -t $CI_REGISTRY/docker/ubuntu:latest
+      --platform linux/amd64,linux/arm64,linux/arm/v7
+      --push --provenance false
+
+build_18:
+  variables:
+    UBUNTU_VER: "18.04"
   image: docker:23.0.1
   stage: build
   rules:
@@ -20,4 +63,3 @@ build:
       -t $CI_REGISTRY/docker/ubuntu:latest
       --platform linux/amd64,linux/arm64,linux/arm/v7
       --push --provenance false
-    
\ No newline at end of file