Skip to content

Commit

Permalink
make apt non-interactive (#137)
Browse files Browse the repository at this point in the history
also make script execution more verbose

Co-authored-by: craig bender <[email protected]>
  • Loading branch information
alexsander-souza and ThinGuy authored Sep 14, 2023
1 parent ed74218 commit b27071c
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 9 deletions.
3 changes: 2 additions & 1 deletion ubuntu/scripts/cleanup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# cleanup.sh - Remove cache and install artifacts
#
Expand All @@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
export DEBIAN_FRONTEND=noninteractive

apt-get autoremove --purge -yq
apt-get clean -yq
2 changes: 1 addition & 1 deletion ubuntu/scripts/cloudimg/cleanup.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# cleanup.sh - Clean up what we did to be able to build the image.
#
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/scripts/cloudimg/install-custom-kernel.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# install-custom-kernel.sh - Install custom kernel, if specified
#
Expand Down
3 changes: 2 additions & 1 deletion ubuntu/scripts/cloudimg/setup-boot.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# setup-boot.sh - Set up the image after initial boot
#
Expand All @@ -17,6 +17,7 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

export DEBIAN_FRONTEND=noninteractive

# Configure apt proxy if needed.
packer_apt_proxy_config="/etc/apt/apt.conf.d/packer-proxy.conf"
Expand Down
2 changes: 1 addition & 1 deletion ubuntu/scripts/cloudimg/setup-curtin.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# cloud-img-setup-curtin.sh - Set up curtin curthooks, if needed.
#
Expand Down
4 changes: 3 additions & 1 deletion ubuntu/scripts/curtin.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# curtin.sh - Move curtin scripts to final destination
#
Expand All @@ -19,6 +19,8 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.

export DEBIAN_FRONTEND=noninteractive

apt-get install -y jq
mkdir -p /curtin

Expand Down
2 changes: 1 addition & 1 deletion ubuntu/scripts/install-custom-packages
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# install-custom-packages - Install custom packages
#
Expand Down
3 changes: 2 additions & 1 deletion ubuntu/scripts/networking.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# networking.sh - Prepare image to boot with cloud-init
#
Expand All @@ -18,6 +18,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
export DEBIAN_FRONTEND=noninteractive

apt-get install -qy netplan.io cloud-init

Expand Down
2 changes: 1 addition & 1 deletion ubuntu/scripts/setup-bootloader
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/bash -e
#!/bin/bash -ex
#
# setup-bootloader - Install bootloader in the boot disk
#
Expand Down

0 comments on commit b27071c

Please sign in to comment.