diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-12-15 01:42:53 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-12-15 01:42:53 +0100 |
| commit | 74cabf7948b2597f5b6a67d6910c844fd1a88ff6 (patch) | |
| tree | db1f30ada487c3831ea8e4e98b2d39edc9e88eea /security/nss/automation/taskcluster/scripts | |
| parent | 09ef48bd005a7f9e97a3fe797a079fcf2b5e58d3 (diff) | |
| download | UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.gz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.lz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.tar.xz UXP-74cabf7948b2597f5b6a67d6910c844fd1a88ff6.zip | |
Update NSS to 3.41
Diffstat (limited to 'security/nss/automation/taskcluster/scripts')
| -rw-r--r-- | security/nss/automation/taskcluster/scripts/build_image.sh | 8 | ||||
| -rw-r--r-- | security/nss/automation/taskcluster/scripts/tools.sh | 9 |
2 files changed, 8 insertions, 9 deletions
diff --git a/security/nss/automation/taskcluster/scripts/build_image.sh b/security/nss/automation/taskcluster/scripts/build_image.sh index b422214e7..b8715dbe9 100644 --- a/security/nss/automation/taskcluster/scripts/build_image.sh +++ b/security/nss/automation/taskcluster/scripts/build_image.sh @@ -13,12 +13,12 @@ raise_error() { test -n "$PROJECT" || raise_error "Project must be provided." test -n "$HASH" || raise_error "Context Hash must be provided." -CONTEXT_PATH=/home/worker/nss/$CONTEXT_PATH +CONTEXT_PATH="/home/worker/nss/$CONTEXT_PATH" -test -d $CONTEXT_PATH || raise_error "Context Path $CONTEXT_PATH does not exist." +test -d "$CONTEXT_PATH" || raise_error "Context Path $CONTEXT_PATH does not exist." test -f "$CONTEXT_PATH/Dockerfile" || raise_error "Dockerfile must be present in $CONTEXT_PATH." -docker build -t $PROJECT:$HASH $CONTEXT_PATH +docker build -t "$PROJECT:$HASH" "$CONTEXT_PATH" mkdir /artifacts -docker save $PROJECT:$HASH > /artifacts/image.tar +docker save "$PROJECT:$HASH" > /artifacts/image.tar diff --git a/security/nss/automation/taskcluster/scripts/tools.sh b/security/nss/automation/taskcluster/scripts/tools.sh index 534cb32ce..63a6ee8de 100644 --- a/security/nss/automation/taskcluster/scripts/tools.sh +++ b/security/nss/automation/taskcluster/scripts/tools.sh @@ -2,12 +2,11 @@ set -v -e -x +# Assert that we're not running as root. if [[ $(id -u) -eq 0 ]]; then - # Stupid Docker. It works without sometimes... But not always. - echo "127.0.0.1 localhost.localdomain" >> /etc/hosts - - # Drop privileges by re-running this script. - # Note: this mangles arguments, better to avoid running scripts as root. + # This exec is still needed until aarch64 images are updated (Bug 1488325). + # Remove when images are updated. Until then, assert that things are good. + [[ $(uname -m) == aarch64 ]] exec su worker -c "$0 $*" fi |