Skip to content
This repository was archived by the owner on Nov 16, 2020. It is now read-only.

Commit ea6cb0e

Browse files
authored
Remove unused packages/binaries (#771)
Removed: * govc * docker-compose * java (used only for creating java keystore, which was used for admiral in vic) * pyyaml * python-pip Reduces OVA size from ~280MB to ~180MB Testing: - tested on Fusion
1 parent 848f444 commit ea6cb0e

File tree

5 files changed

+1
-57
lines changed

5 files changed

+1
-57
lines changed

ova/bootable/build-base.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ function set_base() {
7979

8080
log3 "installing package dependencies"
8181
tdnf install --installroot "${rt}/" --refresh -y \
82-
docker openjre8 python-pip
82+
docker
8383

8484
log3 "installing ${brprpl}root${reset}"
8585
cp -a "${src}/root/." "${rt}/"

ova/ova-manifest.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@
77
"type": "shell",
88
"script": "scripts/provisioners/filesystem_provisioning.sh"
99
},
10-
{
11-
"type": "shell",
12-
"script": "scripts/provisioners/provision_govc.sh"
13-
},
1410
{
1511
"type": "file",
1612
"source": "../bin/ovfenv",

ova/scripts/provisioners/package_provisioning.sh

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,6 @@
1414
# limitations under the License.
1515
set -euf -o pipefail
1616

17-
echo "installing pyyaml"
18-
pip install pyyaml
19-
20-
echo "installing - docker compose"
21-
curl -o /usr/local/bin/docker-compose -L'#' "https://github.com/docker/compose/releases/download/1.11.1/docker-compose-$(uname -s)-$(uname -m)"
22-
chmod +x /usr/local/bin/docker-compose
23-
2417
echo "installing - jq"
2518
curl -o /usr/bin/jq -L'#' "https://github.com/stedolan/jq/releases/download/jq-1.5/jq-linux64"
2619
chmod +x /usr/bin/jq

ova/scripts/provisioners/provision_govc.sh

Lines changed: 0 additions & 28 deletions
This file was deleted.

ova/scripts/systemd/scripts/dispatch-appliance-tls.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -49,18 +49,6 @@ function checkKey {
4949
openssl rsa -in "$file" -check
5050
}
5151

52-
# Create java keystore for Admiral
53-
function createKeystore() {
54-
if [ -f "$jks" ]; then
55-
echo "removing existing keystore $jks and recreating"
56-
rm -f $jks
57-
else
58-
echo "no keystore present, creating"
59-
fi
60-
61-
$keytool -import -noprompt -v -trustcacerts -alias selfsignedca -file "$1" -keystore $jks -keypass changeit -storepass changeit
62-
}
63-
6452
# Generate self signed cert
6553
function genCert {
6654
echo "Generating self signed certificate"
@@ -88,9 +76,6 @@ function genCert {
8876
cat $ca_cert >> $cert
8977

9078
echo "self-signed" > $flag
91-
92-
echo "creating java keystore with self-signed CA"
93-
createKeystore $ca_cert
9479
}
9580

9681
function secure {
@@ -110,8 +95,6 @@ function secure {
11095

11196
echo "customized" > $flag
11297

113-
echo "creating java keystore with user provided cert"
114-
createKeystore $cert
11598
return
11699
fi
117100

0 commit comments

Comments
 (0)