aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.github/workflows/test-all.yaml1
-rw-r--r--.github/workflows/test-pr.yaml1
-rw-r--r--src/gradle/devcontainer-feature.json29
-rw-r--r--src/gradle/install.sh129
-rw-r--r--test/gradle/test.sh11
-rw-r--r--v1/feature-scripts.env3
6 files changed, 1 insertions, 173 deletions
diff --git a/.github/workflows/test-all.yaml b/.github/workflows/test-all.yaml
index 8115c5c..be86dc8 100644
--- a/.github/workflows/test-all.yaml
+++ b/.github/workflows/test-all.yaml
@@ -25,7 +25,6 @@ jobs:
"git-lfs",
"github-cli",
"go",
- "gradle"
"hugo",
"java",
"kubectl-helm-minikube",
diff --git a/.github/workflows/test-pr.yaml b/.github/workflows/test-pr.yaml
index 53be3d5..e242ad1 100644
--- a/.github/workflows/test-pr.yaml
+++ b/.github/workflows/test-pr.yaml
@@ -25,7 +25,6 @@ jobs:
git-lfs: ./**/git-lfs/**
github-cli: ./**/github-cli/**
go: ./**/go/**
- gradle: ./**/gradle/**
hugo: ./**/hugo/**
java: ./**/java/**
kubectl-helm-minikube: ./**/kubectl-helm-minikube/**
diff --git a/src/gradle/devcontainer-feature.json b/src/gradle/devcontainer-feature.json
deleted file mode 100644
index 71d9e62..0000000
--- a/src/gradle/devcontainer-feature.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
- "id": "gradle",
- "name": "Gradle (via SDKMAN!)",
- "options": {
- "version": {
- "type": "string",
- "proposals": [
- "latest",
- "none",
- "7",
- "6",
- "5"
- ],
- "default": "latest",
- "description": "Select or enter a Gradle version to install"
- }
- },
- "extensions": [
- "vscjava.vscode-java-pack"
- ],
- "containerEnv": {
- "SDKMAN_DIR": "${SDKMAN_DIR:-\"/usr/local/sdkman\"}",
- "PATH": "${SDKMAN_DIR}/bin:${SDKMAN_DIR}/candidates/gradle/current/bin:${PATH}"
- },
- "install": {
- "app": "",
- "file": "install.sh"
- }
-}
diff --git a/src/gradle/install.sh b/src/gradle/install.sh
deleted file mode 100644
index 9a51faf..0000000
--- a/src/gradle/install.sh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env bash
-#-------------------------------------------------------------------------------------------------------------
-# Copyright (c) Microsoft Corporation. All rights reserved.
-# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
-#-------------------------------------------------------------------------------------------------------------
-
-GRADLE_VERSION=${VERSION:-"latest"}
-USERNAME=${USERNAME:-"automatic"}
-UPDATE_RC=${UPDATE_RC:-"true"}
-
-export SDKMAN_DIR=${SDKMAN_DIR:-"/usr/local/sdkman"}
-
-set -e
-
-if [ "$(id -u)" -ne 0 ]; then
- echo -e 'Script must be run as root. Use sudo, su, or add "USER root" to your Dockerfile before running this script.'
- exit 1
-fi
-
-# Ensure that login shells get the correct path if the user updated the PATH using ENV.
-rm -f /etc/profile.d/00-restore-env.sh
-echo "export PATH=${PATH//$(sh -lc 'echo $PATH')/\$PATH}" > /etc/profile.d/00-restore-env.sh
-chmod +x /etc/profile.d/00-restore-env.sh
-
-# Determine the appropriate non-root user
-if [ "${USERNAME}" = "auto" ] || [ "${USERNAME}" = "automatic" ]; then
- USERNAME=""
- POSSIBLE_USERS=("vscode" "node" "codespace" "$(awk -v val=1000 -F ":" '$3==val{print $1}' /etc/passwd)")
- for CURRENT_USER in "${POSSIBLE_USERS[@]}"; do
- if id -u ${CURRENT_USER} > /dev/null 2>&1; then
- USERNAME=${CURRENT_USER}
- break
- fi
- done
- if [ "${USERNAME}" = "" ]; then
- USERNAME=root
- fi
-elif [ "${USERNAME}" = "none" ] || ! id -u ${USERNAME} > /dev/null 2>&1; then
- USERNAME=root
-fi
-
-updaterc() {
- if [ "${UPDATE_RC}" = "true" ]; then
- echo "Updating /etc/bash.bashrc and /etc/zsh/zshrc..."
- if [[ "$(cat /etc/bash.bashrc)" != *"$1"* ]]; then
- echo -e "$1" >> /etc/bash.bashrc
- fi
- if [ -f "/etc/zsh/zshrc" ] && [[ "$(cat /etc/zsh/zshrc)" != *"$1"* ]]; then
- echo -e "$1" >> /etc/zsh/zshrc
- fi
- fi
-}
-
-# Function to run apt-get if needed
-apt_get_update_if_needed()
-{
- if [ ! -d "/var/lib/apt/lists" ] || [ "$(ls /var/lib/apt/lists/ | wc -l)" = "0" ]; then
- echo "Running apt-get update..."
- apt-get update
- else
- echo "Skipping apt-get update."
- fi
-}
-
-# Checks if packages are installed and installs them if not
-check_packages() {
- if ! dpkg -s "$@" > /dev/null 2>&1; then
- apt_get_update_if_needed
- apt-get -y install --no-install-recommends "$@"
- fi
-}
-
-# Use SDKMAN to install something using a partial version match
-sdk_install() {
- local install_type=$1
- local requested_version=$2
- local prefix=$3
- local suffix="${4:-"\\s*"}"
- local full_version_check=${5:-".*-[a-z]+"}
- if [ "${requested_version}" = "none" ]; then return; fi
- # Blank will install latest stable version
- if [ "${requested_version}" = "lts" ] || [ "${requested_version}" = "default" ]; then
- requested_version=""
- elif echo "${requested_version}" | grep -oE "${full_version_check}" > /dev/null 2>&1; then
- echo "${requested_version}"
- else
- local regex="${prefix}\\K[0-9]+\\.[0-9]+\\.[0-9]+${suffix}"
- local version_list="$(. ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk list ${install_type} 2>&1 | grep -oP "${regex}" | tr -d ' ' | sort -rV)"
- if [ "${requested_version}" = "latest" ] || [ "${requested_version}" = "current" ]; then
- requested_version="$(echo "${version_list}" | head -n 1)"
- else
- set +e
- requested_version="$(echo "${version_list}" | grep -E -m 1 "^${requested_version//./\\.}([\\.\\s]|$)")"
- set -e
- fi
- if [ -z "${requested_version}" ] || ! echo "${version_list}" | grep "^${requested_version//./\\.}$" > /dev/null 2>&1; then
- echo -e "Version $2 not found. Available versions:\n${version_list}" >&2
- exit 1
- fi
- fi
- su ${USERNAME} -c "umask 0002 && . ${SDKMAN_DIR}/bin/sdkman-init.sh && sdk install ${install_type} ${requested_version} && sdk flush archives && sdk flush temp"
-}
-
-export DEBIAN_FRONTEND=noninteractive
-
-# Install dependencies
-check_packages curl ca-certificates zip unzip sed
-
-# Install sdkman if not installed
-if [ ! -d "${SDKMAN_DIR}" ]; then
- # Create sdkman group, dir, and set sticky bit
- if ! cat /etc/group | grep -e "^sdkman:" > /dev/null 2>&1; then
- groupadd -r sdkman
- fi
- usermod -a -G sdkman ${USERNAME}
- umask 0002
- # Install SDKMAN
- curl -sSL "https://get.sdkman.io?rcupdate=false" | bash
- chown -R :sdkman ${SDKMAN_DIR}
- find ${SDKMAN_DIR} -type d | xargs -d '\n' chmod g+s
- # Add sourcing of sdkman into bashrc/zshrc files (unless disabled)
- updaterc "export SDKMAN_DIR=${SDKMAN_DIR}\n. \${SDKMAN_DIR}/bin/sdkman-init.sh"
-fi
-
-# Install gradle
-sdk_install gradle ${GRADLE_VERSION} '\s\s' '\s\s' '^[0-9]+\.[0-9]+\.[0-9]+$'
-updaterc '[ -z "${GRADLE_USER_HOME}" ] && export GRADLE_USER_HOME=${HOME}/.gradle'
-
-echo "Done!"
diff --git a/test/gradle/test.sh b/test/gradle/test.sh
deleted file mode 100644
index d94da25..0000000
--- a/test/gradle/test.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Optional: Import test library
-source dev-container-features-test-lib
-
-check "version" gradle --version
-
-# Report result
-reportResults \ No newline at end of file
diff --git a/v1/feature-scripts.env b/v1/feature-scripts.env
index e1d79e7..c3e9936 100644
--- a/v1/feature-scripts.env
+++ b/v1/feature-scripts.env
@@ -23,5 +23,4 @@ _BUILD_ARG_DOTNET="./dotnet/install.sh ${_B
_BUILD_ARG_PHP="./php/install.sh ${_BUILD_ARG_PHP_VERSION:-latest} /usr/local/php ${_BUILD_ARG_PHP_INSTALLCOMPOSER:-true} automatic true ${_BUILD_ARG_PHP_OVERRIDEDEFAULTVERSION:-true}"
_BUILD_ARG_ORYX="./oryx/install.sh automatic true"
_BUILD_ARG_HUGO="./hugo/install.sh ${_BUILD_ARG_HUGO_VERSION:-latest} automatic true"
-_BUILD_ARG_ANACONDA="./anaconda/install.sh ${_BUILD_ARG_ANACONDA_VERSION:-latest} automatic true"
-_BUILD_ARG_GRADLE="./gradle/install.sh ${_BUILD_ARG_GRADLE_VERSION:-latest} automatic true" \ No newline at end of file
+_BUILD_ARG_ANACONDA="./anaconda/install.sh ${_BUILD_ARG_ANACONDA_VERSION:-latest} automatic true" \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-19 19:14:50 +0300