mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-11-16 01:07:11 +00:00
Install default-jdk-headless instead of default-jdk
This reduces the dependencies installed.
This commit is contained in:
parent
61e9029be4
commit
1d090aa7a3
22
.github/workflows/linux-ci-helper.sh
vendored
22
.github/workflows/linux-ci-helper.sh
vendored
@ -62,49 +62,49 @@ if [ "${CONTAINER_FULLNAME}" = "ubuntu:21.10" ]; then
|
|||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:20.04" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:20.04" ]; then
|
||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:18.04" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:18.04" ]; then
|
||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:16.04" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "ubuntu:16.04" ]; then
|
||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "debian:buster" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "debian:buster" ]; then
|
||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 procps python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget python2 procps python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "debian:stretch" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "debian:stretch" ]; then
|
||||||
PACKAGE_MANAGER_BIN="apt-get"
|
PACKAGE_MANAGER_BIN="apt-get"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="autoconf autotools-dev default-jdk fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget procps python3-pip"
|
INSTALL_PACKAGES="autoconf autotools-dev default-jdk-headless fuse libfuse-dev libcurl4-openssl-dev libxml2-dev locales-all mime-support libtool pkg-config libssl-dev attr wget procps python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "centos:centos8" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "centos:centos8" ]; then
|
||||||
PACKAGE_MANAGER_BIN="dnf"
|
PACKAGE_MANAGER_BIN="dnf"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk libxml2-devel mailcap git automake make openssl-devel attr diffutils wget python2 python3"
|
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk-headless libxml2-devel mailcap git automake make openssl-devel attr diffutils wget python2 python3"
|
||||||
INSTALL_CPPCHECK_OPTIONS="--enablerepo=powertools"
|
INSTALL_CPPCHECK_OPTIONS="--enablerepo=powertools"
|
||||||
|
|
||||||
# [NOTE]
|
# [NOTE]
|
||||||
@ -116,7 +116,7 @@ elif [ "${CONTAINER_FULLNAME}" = "centos:centos7" ]; then
|
|||||||
PACKAGE_MANAGER_BIN="yum"
|
PACKAGE_MANAGER_BIN="yum"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y"
|
PACKAGE_UPDATE_OPTIONS="update -y"
|
||||||
|
|
||||||
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk libxml2-devel mailcap git automake make openssl-devel attr wget python3 epel-release"
|
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk-headless libxml2-devel mailcap git automake make openssl-devel attr wget python3 epel-release"
|
||||||
INSTALL_CPPCHECK_OPTIONS="--enablerepo=epel"
|
INSTALL_CPPCHECK_OPTIONS="--enablerepo=epel"
|
||||||
|
|
||||||
# [NOTE]
|
# [NOTE]
|
||||||
@ -128,15 +128,15 @@ elif [ "${CONTAINER_FULLNAME}" = "fedora:35" ]; then
|
|||||||
PACKAGE_MANAGER_BIN="dnf"
|
PACKAGE_MANAGER_BIN="dnf"
|
||||||
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
PACKAGE_UPDATE_OPTIONS="update -y -qq"
|
||||||
|
|
||||||
# TODO: Cannot use java-latest-openjdk (17) due to modules issue
|
# TODO: Cannot use java-latest-openjdk (17) due to modules issue in S3Proxy/jclouds/Guice
|
||||||
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk libxml2-devel mailcap git automake make openssl-devel wget attr diffutils python2 procps python3-pip"
|
INSTALL_PACKAGES="curl-devel fuse fuse-devel gcc libstdc++-devel gcc-c++ glibc-langpack-en java-11-openjdk-headless libxml2-devel mailcap git automake make openssl-devel wget attr diffutils python2 procps python3-pip"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
|
elif [ "${CONTAINER_FULLNAME}" = "opensuse/leap:15" ]; then
|
||||||
PACKAGE_MANAGER_BIN="zypper"
|
PACKAGE_MANAGER_BIN="zypper"
|
||||||
PACKAGE_UPDATE_OPTIONS="refresh"
|
PACKAGE_UPDATE_OPTIONS="refresh"
|
||||||
|
|
||||||
INSTALL_PACKAGES="automake curl-devel fuse fuse-devel gcc-c++ java-11-openjdk libxml2-devel make openssl-devel python3-pip wget attr"
|
INSTALL_PACKAGES="automake curl-devel fuse fuse-devel gcc-c++ java-11-openjdk-headless libxml2-devel make openssl-devel python3-pip wget attr"
|
||||||
INSTALL_CPPCHECK_OPTIONS=""
|
INSTALL_CPPCHECK_OPTIONS=""
|
||||||
|
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user