port changes from vscode-dev-containers for jammy compat (#44)
* package compat * port git-lfs fix (https://github.com/microsoft/vscode-dev-containers/pull/1500)
This commit is contained in:
parent
60970fcba5
commit
3d29560211
2 changed files with 16 additions and 2 deletions
|
@ -102,7 +102,7 @@ if [ "${PACKAGES_ALREADY_INSTALLED}" != "true" ]; then
|
||||||
libkrb5-3 \
|
libkrb5-3 \
|
||||||
libgssapi-krb5-2 \
|
libgssapi-krb5-2 \
|
||||||
libicu[0-9][0-9] \
|
libicu[0-9][0-9] \
|
||||||
liblttng-ust0 \
|
liblttng-ust[0-9] \
|
||||||
libstdc++6 \
|
libstdc++6 \
|
||||||
zlib1g \
|
zlib1g \
|
||||||
locales \
|
locales \
|
||||||
|
|
|
@ -139,6 +139,7 @@ install_using_apt() {
|
||||||
|
|
||||||
if ! (apt-get update && apt-get install -yq git-lfs${version_suffix}); then
|
if ! (apt-get update && apt-get install -yq git-lfs${version_suffix}); then
|
||||||
rm -f /etc/apt/sources.list.d/git-lfs.list
|
rm -f /etc/apt/sources.list.d/git-lfs.list
|
||||||
|
echo "Could not fetch git-lfs from apt"
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -151,6 +152,7 @@ install_using_github() {
|
||||||
cd /tmp/git-lfs
|
cd /tmp/git-lfs
|
||||||
find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
|
find_version_from_git_tags GIT_LFS_VERSION "https://github.com/git-lfs/git-lfs"
|
||||||
git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz"
|
git_lfs_filename="git-lfs-linux-${architecture}-v${GIT_LFS_VERSION}.tar.gz"
|
||||||
|
echo "Looking for release artfact: ${git_lfs_filename}"
|
||||||
curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}"
|
curl -sSL -o "${git_lfs_filename}" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/${git_lfs_filename}"
|
||||||
# Verify file
|
# Verify file
|
||||||
curl -sSL -o "sha256sums.asc" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/sha256sums.asc"
|
curl -sSL -o "sha256sums.asc" "https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/sha256sums.asc"
|
||||||
|
@ -158,8 +160,20 @@ install_using_github() {
|
||||||
gpg -q --decrypt "sha256sums.asc" > sha256sums
|
gpg -q --decrypt "sha256sums.asc" > sha256sums
|
||||||
sha256sum --ignore-missing -c "sha256sums"
|
sha256sum --ignore-missing -c "sha256sums"
|
||||||
# Extract and install
|
# Extract and install
|
||||||
|
echo "Validated release artifact integrity."
|
||||||
|
echo "Starting to extract..."
|
||||||
tar xf "${git_lfs_filename}" -C .
|
tar xf "${git_lfs_filename}" -C .
|
||||||
|
echo "Installing..."
|
||||||
|
if [ -f "./install.sh" ]; then
|
||||||
./install.sh
|
./install.sh
|
||||||
|
else
|
||||||
|
# Starting around v3.2.0, the release
|
||||||
|
# artifact file structure changed slightly
|
||||||
|
enclosed_folder="git-lfs-${GIT_LFS_VERSION}"
|
||||||
|
cd ${enclosed_folder}
|
||||||
|
./install.sh
|
||||||
|
cd ../
|
||||||
|
fi
|
||||||
rm -rf /tmp/git-lfs /tmp/tmp-gnupg
|
rm -rf /tmp/git-lfs /tmp/tmp-gnupg
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue