github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #507 from Random-Liu/use-sha256

Browse Source 
Use sha256 instead of sha1.
This commit is contained in:
Lantao Liu 2017-12-15 13:32:45 -08:00 committed by GitHub
commit 9dc6e25498
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/installation.md
View File

@ -81,8 +81,8 @@ wget https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERS
``` ```
Validate checksum of the release tarball (note that checksum is added since v1.0.0-beta.0): Validate checksum of the release tarball (note that checksum is added since v1.0.0-beta.0):
```bash ```bash
sha1sum cri-containerd-${VERSION}.linux-amd64.tar.gz sha256sum cri-containerd-${VERSION}.linux-amd64.tar.gz
curl https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz.sha1 curl https://storage.googleapis.com/cri-containerd-release/cri-containerd-${VERSION}.linux-amd64.tar.gz.sha256
# Compare to make sure the 2 checksums are the same. # Compare to make sure the 2 checksums are the same.
``` ```
## Step 2: Install CRI-Containerd ## Step 2: Install CRI-Containerd

2
hack/push.sh
View File

@ -34,7 +34,7 @@ LATEST=${LATEST:-"latest"}
PUSH_VERSION=${PUSH_VERSION:-false} PUSH_VERSION=${PUSH_VERSION:-false}
release_tar=${ROOT}/${BUILD_DIR}/${TARBALL} release_tar=${ROOT}/${BUILD_DIR}/${TARBALL}
release_tar_checksum=${release_tar}.sha1 release_tar_checksum=${release_tar}.sha256
if [[ ! -e ${release_tar} || ! -e ${release_tar_checksum} ]]; then if [[ ! -e ${release_tar} || ! -e ${release_tar_checksum} ]]; then
echo "Release tarball is not built" echo "Release tarball is not built"
exit 1 exit 1

6
hack/release.sh
View File

@ -47,6 +47,6 @@ cp -r ${ROOT}/cluster ${destdir}/opt/cri-containerd
# Create release tar # Create release tar
tarball=${BUILD_DIR}/${TARBALL} tarball=${BUILD_DIR}/${TARBALL}
tar -zcvf ${tarball} -C ${destdir} . tar -zcvf ${tarball} -C ${destdir} .
checksum=$(sha1 ${tarball}) checksum=$(sha256 ${tarball})
echo "sha1sum: ${checksum} ${tarball}" echo "sha256sum: ${checksum} ${tarball}"
echo ${checksum} > ${tarball}.sha1 echo ${checksum} > ${tarball}.sha256

10
hack/test-utils.sh
View File

@ -123,13 +123,13 @@ create_ttl_bucket() {
gsutil defacl set public-read "gs://${bucket}" gsutil defacl set public-read "gs://${bucket}"
} }
# sha1 generates a sha1 checksum for a file. # sha256 generates a sha256 checksum for a file.
# Var set: # Var set:
# 1. Filename. # 1. Filename.
sha1() { sha256() {
if which sha1sum >/dev/null 2>&1; then if which sha256sum >/dev/null 2>&1; then
sha1sum "$1" | awk '{ print $1 }' sha256sum "$1" | awk '{ print $1 }'
else else
shasum -a1 "$1" | awk '{ print $1 }' shasum -a256 "$1" | awk '{ print $1 }'
fi fi
} }