diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index cdce8b9..d99d88d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,3 @@ -variables: - LATEST_VER: "22.04" - build_22: variables: UBUNTU_VER: "22.04" @@ -9,20 +6,10 @@ build_22: rules: - changes: - Dockerfile + - build_command.sh - scripts/**/* - - .gitlab-ci.yml 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 + - sh build_command.sh build_20: variables: @@ -32,19 +19,10 @@ build_20: rules: - changes: - Dockerfile + - build_command.sh - scripts/**/* - - .gitlab-ci.yml 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 - --platform linux/amd64,linux/arm64,linux/arm/v7 - --push --provenance false + - sh build_command.sh build_18: variables: @@ -54,16 +32,7 @@ build_18: rules: - changes: - Dockerfile + - build_command.sh - scripts/**/* - - .gitlab-ci.yml 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 - --platform linux/amd64,linux/arm64,linux/arm/v7 - --push --provenance false + - sh build_command.sh