[TryMOSK] Make Apt configuration in a separate script
Related-Prod: PRODX-53424
Change-Id: I00191ccaaaebaaeafdc054d108bd82cb9b921d26
diff --git a/trymos/image_build/scripts/apt-configure.sh b/trymos/image_build/scripts/apt-configure.sh
new file mode 100755
index 0000000..5a65109
--- /dev/null
+++ b/trymos/image_build/scripts/apt-configure.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -ex
+
+# Disable unattended upgrades
+sed -i 's/APT::Periodic::Unattended-Upgrade "1"/APT::Periodic::Unattended-Upgrade "0"/' /etc/apt/apt.conf.d/20auto-upgrades
+sed -i 's/APT::Periodic::Update-Package-Lists "1"/APT::Periodic::Update-Package-Lists "0"/g' /etc/apt/apt.conf.d/*
diff --git a/trymos/image_build/scripts/build-image.sh b/trymos/image_build/scripts/build-image.sh
index e09fdc2..ce14119 100755
--- a/trymos/image_build/scripts/build-image.sh
+++ b/trymos/image_build/scripts/build-image.sh
@@ -4,10 +4,6 @@
LOG_FILE=${LOG_FILE:-"/var/log/build-image.log"}
-# Disable unattended upgrades
-sed -i 's/APT::Periodic::Unattended-Upgrade "1"/APT::Periodic::Unattended-Upgrade "0"/' /etc/apt/apt.conf.d/20auto-upgrades
-sed -i 's/APT::Periodic::Update-Package-Lists "1"/APT::Periodic::Update-Package-Lists "0"/g' /etc/apt/apt.conf.d/*
-
apt update -y
DEBIAN_FRONTEND=noninteractive apt install -y moreutils
diff --git a/trymos/image_build/template.json b/trymos/image_build/template.json
index db18625..eb2de6a 100644
--- a/trymos/image_build/template.json
+++ b/trymos/image_build/template.json
@@ -37,6 +37,12 @@
},
{
"type": "shell",
+ "scripts": [
+ "scripts/apt-configure.sh"
+ ]
+ },
+ {
+ "type": "shell",
"inline": [
"/srv/trymosk/image_build/build-image.sh",
"rm -rf /srv/trymosk/image_build"