From e6e504634882302a95fa4ccac77d39b5e41f14a9 Mon Sep 17 00:00:00 2001 From: John Doe Date: Fri, 30 Jan 2026 19:54:24 -0500 Subject: [PATCH] more stuffff --- .github/workflows/daily-build-pure-shell.yml | 118 +++++++++++++++++- .../workflows/security-scan-pure-shell.yml | 56 ++++++++- 2 files changed, 169 insertions(+), 5 deletions(-) diff --git a/.github/workflows/daily-build-pure-shell.yml b/.github/workflows/daily-build-pure-shell.yml index 3a1ee72..dfa71aa 100644 --- a/.github/workflows/daily-build-pure-shell.yml +++ b/.github/workflows/daily-build-pure-shell.yml @@ -81,23 +81,78 @@ jobs: cp -r . ${{ github.workspace }} shell: bash + - name: Install Docker + run: | + echo "đŸŗ Installing Docker..." + + # Check if Docker is already installed + if command -v docker &> /dev/null; then + echo "✅ Docker is already installed" + docker --version + else + echo "đŸ“Ļ Installing Docker..." + + # Update package index + sudo apt-get update + + # Install prerequisites + sudo apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg \ + lsb-release + + # Add Docker GPG key + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + + # Add Docker repository + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + + # Install Docker + sudo apt-get update + sudo apt-get install -y docker-ce docker-ce-cli containerd.io + + # Start Docker service + sudo systemctl start docker + sudo systemctl enable docker + + # Add current user to docker group + sudo usermod -aG docker $USER + + echo "✅ Docker installation completed" + docker --version + fi + shell: bash + - name: Set up Docker Buildx run: | echo "đŸŗ Setting up Docker Buildx..." + # Ensure Docker daemon is running + if ! docker info &> /dev/null; then + echo "🔄 Starting Docker daemon..." + sudo systemctl start docker + sleep 5 + fi + # Check if buildx is available if ! docker buildx version > /dev/null 2>&1; then - echo "Installing Docker Buildx..." + echo "đŸ“Ļ Installing Docker Buildx..." mkdir -p ~/.docker/cli-plugins BUILDX_VERSION="v0.12.1" wget -q -O ~/.docker/cli-plugins/docker-buildx \ "https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64" chmod +x ~/.docker/cli-plugins/docker-buildx + else + echo "✅ Docker Buildx is already available" fi # Create and use builder instance - docker buildx create --name mybuilder --use --bootstrap || echo "Builder already exists" + docker buildx create --name mybuilder --use --bootstrap 2>/dev/null || echo "ℹī¸ Builder already exists or creation skipped" docker buildx inspect --bootstrap + + echo "✅ Docker Buildx setup completed" shell: bash - name: Log in to Docker Hub @@ -168,23 +223,78 @@ jobs: cp -r . ${{ github.workspace }} shell: bash + - name: Install Docker + run: | + echo "đŸŗ Installing Docker for GPU variants..." + + # Check if Docker is already installed + if command -v docker &> /dev/null; then + echo "✅ Docker is already installed" + docker --version + else + echo "đŸ“Ļ Installing Docker..." + + # Update package index + sudo apt-get update + + # Install prerequisites + sudo apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg \ + lsb-release + + # Add Docker GPG key + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + + # Add Docker repository + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + + # Install Docker + sudo apt-get update + sudo apt-get install -y docker-ce docker-ce-cli containerd.io + + # Start Docker service + sudo systemctl start docker + sudo systemctl enable docker + + # Add current user to docker group + sudo usermod -aG docker $USER + + echo "✅ Docker installation completed" + docker --version + fi + shell: bash + - name: Set up Docker Buildx run: | echo "đŸŗ Setting up Docker Buildx for GPU variant ${{ matrix.gfx_arch }}..." + # Ensure Docker daemon is running + if ! docker info &> /dev/null; then + echo "🔄 Starting Docker daemon..." + sudo systemctl start docker + sleep 5 + fi + # Check if buildx is available if ! docker buildx version > /dev/null 2>&1; then - echo "Installing Docker Buildx..." + echo "đŸ“Ļ Installing Docker Buildx..." mkdir -p ~/.docker/cli-plugins BUILDX_VERSION="v0.12.1" wget -q -O ~/.docker/cli-plugins/docker-buildx \ "https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64" chmod +x ~/.docker/cli-plugins/docker-buildx + else + echo "✅ Docker Buildx is already available" fi # Create and use builder instance - docker buildx create --name mybuilder-${{ matrix.gfx_arch }} --use --bootstrap || echo "Builder already exists" + docker buildx create --name mybuilder-${{ matrix.gfx_arch }} --use --bootstrap 2>/dev/null || echo "ℹī¸ Builder already exists or creation skipped" docker buildx inspect --bootstrap + + echo "✅ Docker Buildx setup completed for ${{ matrix.gfx_arch }}" shell: bash - name: Log in to Docker Hub diff --git a/.github/workflows/security-scan-pure-shell.yml b/.github/workflows/security-scan-pure-shell.yml index 57d1b49..c71fa8c 100644 --- a/.github/workflows/security-scan-pure-shell.yml +++ b/.github/workflows/security-scan-pure-shell.yml @@ -86,18 +86,72 @@ jobs: cp -r . ${{ github.workspace }} shell: bash + - name: Install Docker + run: | + echo "đŸŗ Installing Docker for security scan..." + + # Check if Docker is already installed + if command -v docker &> /dev/null; then + echo "✅ Docker is already installed" + docker --version + else + echo "đŸ“Ļ Installing Docker..." + + # Update package index + sudo apt-get update + + # Install prerequisites + sudo apt-get install -y \ + apt-transport-https \ + ca-certificates \ + curl \ + gnupg \ + lsb-release + + # Add Docker GPG key + curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg + + # Add Docker repository + echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null + + # Install Docker + sudo apt-get update + sudo apt-get install -y docker-ce docker-ce-cli containerd.io + + # Start Docker service + sudo systemctl start docker + sudo systemctl enable docker + + # Add current user to docker group + sudo usermod -aG docker $USER + + echo "✅ Docker installation completed" + docker --version + fi + shell: bash + - name: Set up Docker Buildx run: | echo "đŸŗ Setting up Docker Buildx for security scan..." + # Ensure Docker daemon is running + if ! docker info &> /dev/null; then + echo "🔄 Starting Docker daemon..." + sudo systemctl start docker + sleep 5 + fi + # Check if buildx is available if ! docker buildx version > /dev/null 2>&1; then - echo "Installing Docker Buildx..." + echo "đŸ“Ļ Installing Docker Buildx..." mkdir -p ~/.docker/cli-plugins BUILDX_VERSION="v0.12.1" wget -q -O ~/.docker/cli-plugins/docker-buildx \ "https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64" chmod +x ~/.docker/cli-plugins/docker-buildx + else + echo "✅ Docker Buildx is already available" + fi fi # Create and use builder instance