Skip to content

Commit 04928f7

Browse files
committed
feat(docker): update Docker tools installation process
- Clarifies that Docker Buildx is pre-installed in the base image. - Removes redundant installation steps for Docker Buildx from the script. - Updates README to reflect changes in Docker tools installation. - Streamlines verification messages for installed tools.
1 parent 3db3035 commit 04928f7

3 files changed

Lines changed: 22 additions & 27 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ docker run -d \
6363

6464
### Container Tools
6565
- **Docker Compose Plugin** - Multi-container orchestration (latest)
66-
- **Docker Buildx Plugin** - Advanced Docker builds (latest)
66+
- **Docker Buildx** - Advanced Docker builds (pre-installed in base image)
6767

6868
### Kubernetes Tools
6969
- **kubectl** - Kubernetes CLI (latest stable)
Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

3-
# Install Docker Compose plugin and Docker Buildx
3+
# Install Docker Compose plugin
4+
# Note: Docker Buildx is already available in the base image
45

56
echo "Installing Docker tools..."
67

@@ -10,7 +11,8 @@ apt-get install -y --no-install-recommends \
1011
ca-certificates \
1112
curl
1213

13-
# Docker is already installed in the base image, we just need the plugins
14+
# Docker and Docker Buildx are already installed in the base image
15+
# We only need to install the Docker Compose plugin
1416

1517
# Install Docker Compose plugin
1618
echo "Installing Docker Compose plugin..."
@@ -36,23 +38,13 @@ esac
3638
curl -SL "https://github.com/docker/compose/releases/download/v${COMPOSE_VERSION}/docker-compose-linux-${ARCH_SUFFIX}" -o $DOCKER_CONFIG/cli-plugins/docker-compose
3739
chmod +x $DOCKER_CONFIG/cli-plugins/docker-compose
3840

39-
# Install Docker Buildx
40-
echo "Installing Docker Buildx..."
41-
BUILDX_VERSION=$(curl -s https://api.github.com/repos/docker/buildx/releases/latest | grep '"tag_name":' | sed -E 's/.*"v([^"]+)".*/\1/')
42-
if [ -z "$BUILDX_VERSION" ]; then
43-
echo "Failed to get Docker Buildx version, using fallback"
44-
BUILDX_VERSION="0.19.3"
45-
fi
46-
47-
# Download Docker Buildx
48-
curl -SL "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-${ARCH_SUFFIX}" -o $DOCKER_CONFIG/cli-plugins/docker-buildx
49-
chmod +x $DOCKER_CONFIG/cli-plugins/docker-buildx
50-
5141
# Create symlinks for backward compatibility
5242
ln -sf $DOCKER_CONFIG/cli-plugins/docker-compose /usr/local/bin/docker-compose
5343

54-
# Verify installations by checking files exist
55-
echo "Verifying Docker plugin installations..."
44+
# Verify installations
45+
echo "Verifying Docker tools installation..."
46+
47+
# Check Docker Compose plugin
5648
if [ -f "$DOCKER_CONFIG/cli-plugins/docker-compose" ]; then
5749
echo "Docker Compose plugin installed successfully"
5850
ls -la $DOCKER_CONFIG/cli-plugins/docker-compose
@@ -61,19 +53,22 @@ else
6153
exit 1
6254
fi
6355

64-
if [ -f "$DOCKER_CONFIG/cli-plugins/docker-buildx" ]; then
65-
echo "Docker Buildx plugin installed successfully"
66-
ls -la $DOCKER_CONFIG/cli-plugins/docker-buildx
67-
else
68-
echo "ERROR: Docker Buildx plugin not found at $DOCKER_CONFIG/cli-plugins/docker-buildx"
69-
exit 1
70-
fi
71-
72-
# Also check the symlink
56+
# Check the symlink
7357
if [ -L "/usr/local/bin/docker-compose" ]; then
7458
echo "docker-compose symlink created successfully"
7559
else
7660
echo "WARNING: docker-compose symlink not created"
7761
fi
7862

63+
# Verify Docker Buildx is available (should be pre-installed)
64+
echo ""
65+
echo "Verifying pre-installed Docker Buildx..."
66+
if command -v docker &> /dev/null && docker buildx version &> /dev/null; then
67+
echo "Docker Buildx is available (pre-installed in base image):"
68+
docker buildx version
69+
else
70+
echo "WARNING: Docker Buildx not found (should be pre-installed)"
71+
fi
72+
73+
echo ""
7974
echo "Docker tools installation completed successfully!"

src/setup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ setup:
4141

4242
- name: "Install Docker tools"
4343
script: "scripts/install-docker-tools.sh"
44-
description: "Installs Docker Compose plugin and Docker Buildx"
44+
description: "Installs Docker Compose plugin"
4545

4646
- name: "Install JSON/YAML tools"
4747
script: "scripts/install-json-tools.sh"

0 commit comments

Comments
 (0)