NcamGnrvngu/gitlab-build-images
1
0
Fork 0
mirror of https://ops.gitlab.net/gitlab-org/gitlab-build-images.git synced 2025-12-09 10:02:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove specific buildx versions

Browse source
This commit is contained in:
Andrejs Cunskis 2023-02-14 06:07:08 +09:00
parent 41165c16ff
commit 6994bdfc9c
No known key found for this signature in database
GPG key ID: 87CB75083F227241
6 changed files with 3 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.gitlab/ci/docker.images.yml
View file

@ -4,7 +4,6 @@
- .build_dynamic_image
variables:
DOCKER: '23.0.1'
BUILDX: '0.10'
rules:
- !reference [.build_dynamic_image, rules]
- changes:

5
Dockerfile.custom
View file

@ -81,11 +81,6 @@ ARG DOCKER_VERSION
RUN if [ -n "$DOCKER_VERSION" ]; then /scripts/install-docker "$DOCKER_VERSION"; fi
# Docker buildx plugin
ARG BUILDX_VERSION
RUN if [ -n "$BUILDX_VERSION" ]; then /scripts/install-buildx "$BUILDX_VERSION"; fi
# Bazelisk
ARG BAZELISK_VERSION
ARG BAZELISK_DOWNLOAD_SHA256

12
scripts/install-buildx
View file

@ -1,12 +0,0 @@
#!/bin/bash
set -xeou pipefail
BUILDX_VERSION=${1}
PACKAGE_VERSION=$(apt-cache policy docker-buildx-plugin | awk -v dv=${BUILDX_VERSION} '$1 ~ dv {print $1}')
apt-get update && apt-get install -y docker-buildx-plugin=${PACKAGE_VERSION}
apt-get -yq autoremove
apt-get clean -yqq

3
scripts/install-docker
View file

@ -24,7 +24,8 @@ PACKAGE_VERSION=$(apt-cache policy docker-ce | awk -v dv=${DOCKER_VERSION} '$1 ~
apt-get install -y \
docker-ce=${PACKAGE_VERSION} \
docker-ce-cli=${PACKAGE_VERSION}
docker-ce-cli=${PACKAGE_VERSION} \
docker-buildx-plugin
apt-get -yq autoremove
apt-get clean -yqq

18
scripts/lib/custom-docker-build
View file

@ -173,23 +173,6 @@ function print_docker_args() {
printf -- "--build-arg DOCKER_VERSION=%s " "$1"
}
function print_buildx_args() {
case "$1" in
0.8)
BUILDX_VERSION=0.8.2
;;
0.9)
BUILDX_VERSION=0.9.1
;;
0.10)
BUILDX_VERSION=0.10.2
;;
*) fail "Unknown buildx version $1" ;;
esac
printf -- "--build-arg BUILDX_VERSION=%s " "$BUILDX_VERSION"
}
function print_graphicsmagick_args() {
case "$1" in
1.3.29)
@ -370,7 +353,6 @@ function parse_arguments() {
RUST) print_rust_args $version ;;
CHROME) print_chrome_args $version ;;
DOCKER) print_docker_args $version ;;
BUILDX) print_buildx_args $version ;;
GIT) print_git_args $version ;;
LFS) print_lfs_args $version ;;
NODE) print_node_args $version ;;

2
scripts/lib/custom-docker.sh
View file

@ -2,7 +2,7 @@
# various variable operations used in this script.
PATH_TOOLS=(DEBIAN OS UBI RUBY GOLANG RUST NODE POSTGRESQL)
TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK BAZELISK DOCKER BUILDX GCLOUD KUBECTL HELM)
TAG_TOOLS=(BUNDLER RUBYGEMS GIT LFS CHROME YARN GRAPHICSMAGICK BAZELISK DOCKER GCLOUD KUBECTL HELM)
# Generate the docker image path using the components that were specified via
# variables.