Skip to content

Commit

Permalink
Fixed build container setup apt install apt-utils problem
Browse files Browse the repository at this point in the history
Needed -y (yes)

Ticket: ENT-10896
Changelog: none
(cherry picked from commit 8f0d7d7)
  • Loading branch information
craigcomstock committed Nov 16, 2023
1 parent 163e735 commit 79ee296
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/Dockerfile-cfengine-build-package
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM ubuntu:20.04
RUN apt-get update -y && apt-get install -y systemd wget sudo
ADD "${NTECH_ROOT}/buildscripts/ci/setup.sh" /
ADD setup.sh /
RUN /bin/bash -c '/setup.sh 2>&1 > setup.log'
CMD [ "/lib/systemd/systemd" ]
2 changes: 1 addition & 1 deletion ci/docker-build-package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ label=PACKAGES_HUB_x86_64_linux_ubuntu_20
export JOB_BASE_NAME=label=$label


docker build -t $name -f "${NTECH_ROOT}/buildscripts/ci/Dockerfile-$name" .
docker build -t $name -f "${NTECH_ROOT}/buildscripts/ci/Dockerfile-$name" "${NTECH_ROOT}/buildscripts/ci"

# add secret key to enable push up to sftp cache
set +x # hide secrets
Expand Down
10 changes: 5 additions & 5 deletions ci/setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ PREFIX=/var/cfengine
sudo rm -f /bin/rpm

# Install dependencies
sudo apt-get update -y
sudo apt-get update -qy

# install apt-utils so that debconf can configure installed packages
sudo apt-get install apt-utils
sudo apt-get install -qy apt-utils

# git is needed for build-scripts/autogen to determine revision for such things as deps-packaging
sudo apt-get install -qy git
Expand All @@ -25,7 +25,7 @@ sudo python2 get-pip.py
sudo pip install psycopg2-binary

# install composer and friends
sudo apt-get -qq -y install curl php7.4-cli php7.4-curl php7.4-zip php7.4-mbstring php7.4-xml php7.4-gd composer php7.4-ldap
sudo apt-get -qy install curl php7.4-cli php7.4-curl php7.4-zip php7.4-mbstring php7.4-xml php7.4-gd composer php7.4-ldap
# packages needed for autogen
sudo apt-get -qy install git autoconf automake m4 make bison flex \
binutils libtool gcc g++ libc-dev libpam0g-dev python2 python3 psmisc
Expand All @@ -41,7 +41,7 @@ sudo apt-get -qq purge apache* "postgresql*" redis*

# packages needed for installing Mission portal dependencies
# remove any nodejs or node- packages currently in place
sudo apt-get remove -y 'nodejs*' 'node-*'
sudo apt-get remove -qy 'nodejs*' 'node-*'
# replace with exact version we want
wget -O - https://deb.nodesource.com/setup_12.x | sudo -E bash -
sudo apt-get install -y nodejs
sudo apt-get install -qy nodejs

0 comments on commit 79ee296

Please sign in to comment.