You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by bb...@apache.org on 2021/08/17 14:15:05 UTC
[geode-native] branch develop updated: GEODE-9510: Disabled
automatic/background updates. (#843)
This is an automated email from the ASF dual-hosted git repository.
bbender pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git
The following commit(s) were added to refs/heads/develop by this push:
new 3c3cb59 GEODE-9510: Disabled automatic/background updates. (#843)
3c3cb59 is described below
commit 3c3cb5988123a4e464e5aed2e3353f315824382c
Author: Jacob Barrett <jb...@pivotal.io>
AuthorDate: Tue Aug 17 07:14:57 2021 -0700
GEODE-9510: Disabled automatic/background updates. (#843)
---
ci/docker/clang-tools/Dockerfile | 1 +
packer/build-rhel-7.json | 5 +++--
packer/build-rhel-8.json | 5 +++--
packer/rhel/update.sh | 20 --------------------
packer/ubuntu/update.sh | 2 +-
5 files changed, 8 insertions(+), 25 deletions(-)
diff --git a/ci/docker/clang-tools/Dockerfile b/ci/docker/clang-tools/Dockerfile
index a84c777..0674479 100644
--- a/ci/docker/clang-tools/Dockerfile
+++ b/ci/docker/clang-tools/Dockerfile
@@ -24,6 +24,7 @@ RUN apt-get update \
&& apt-get install -y \
curl \
software-properties-common \
+ && apt-get remove -y unattended-upgrades \
&& curl -s https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \
&& add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-${CLANG_VERSION} main" \
&& apt-get update \
diff --git a/packer/build-rhel-7.json b/packer/build-rhel-7.json
index 5b13d02..67465d2 100644
--- a/packer/build-rhel-7.json
+++ b/packer/build-rhel-7.json
@@ -62,8 +62,9 @@
{
"type": "shell",
"execute_command": "{{.Vars}} /bin/sudo -E -S bash '{{.Path}}'",
- "scripts": [
- "rhel/update.sh"
+ "inline": [
+ "yum update -y",
+ "yum remove -y yum-cron"
]
},
{
diff --git a/packer/build-rhel-8.json b/packer/build-rhel-8.json
index c566446..0f1f21e 100644
--- a/packer/build-rhel-8.json
+++ b/packer/build-rhel-8.json
@@ -62,8 +62,9 @@
{
"type": "shell",
"execute_command": "{{.Vars}} /bin/sudo -E -S bash '{{.Path}}'",
- "scripts": [
- "rhel/update.sh"
+ "inline": [
+ "yum update -y",
+ "yum remove -y df-automatic"
]
},
{
diff --git a/packer/rhel/update.sh b/packer/rhel/update.sh
deleted file mode 100644
index 819de1d..0000000
--- a/packer/rhel/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -x -e -o pipefail
-
-yum update -y
diff --git a/packer/ubuntu/update.sh b/packer/ubuntu/update.sh
index 13bc1d1..eaf3569 100644
--- a/packer/ubuntu/update.sh
+++ b/packer/ubuntu/update.sh
@@ -18,4 +18,4 @@
set -x -e -o pipefail
export DEBIAN_FRONTEND=noninteractive
-apt update && apt -yq full-upgrade && apt-get -y autoremove
+apt update && apt -yq full-upgrade && apt-get -y autoremove && apt remove -y unattended-upgrades