Skip to content

Commit 0c5d9fa

Browse files
committed
fix(pack-images): packages install error
1 parent 9ab6f1e commit 0c5d9fa

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

rootfs/usr/local/bin/generate-layer.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ generate_layer() {
1919
# shellcheck disable=SC2086
2020
apt-get $APT_OPTIONS update > /dev/null 2>&1
2121
# shellcheck disable=SC2086
22-
apt-get $APT_OPTIONS -y -d --reinstall install "$(< .deb-list)" > /dev/null 2>&1
23-
find "$APT_CACHE_DIR/archives/" -name "*.deb" -exec dpkg -x {} "$base_layer_dir/" \;
22+
apt-get $APT_OPTIONS -y -d --reinstall install $(< .packages) > /dev/null 2>&1
23+
find "$APT_CACHE_DIR/archives/" -name "*.deb" -exec dpkg --instdir="$base_layer_dir" -i {} \;
2424

2525
mkdir -p "${base_layer_dir}/profile.d"
2626
cat > "${base_layer_dir}/profile.d/base.sh" <<EOL
@@ -40,9 +40,9 @@ EOL
4040
rm -rf "$APT_DIR"
4141
}
4242

43-
if [[ -f ".deb-list" ]]; then
43+
if [[ -f ".packages" ]]; then
4444
echo "---> Generate base layer"
45-
local_checksum=$(sha256sum .deb-list | cut -d ' ' -f 1 || echo 'not found')
45+
local_checksum=$(sha256sum .packages | cut -d ' ' -f 1 || echo 'not found')
4646
remote_checksum='not found'
4747
if [[ -f "${base_layer_dir}.toml" ]]; then
4848
remote_checksum=$(< "${base_layer_dir}.toml" yj -t | jq -r .metadata 2>/dev/null || echo 'not found')
@@ -59,4 +59,4 @@ if [[ -f ".deb-list" ]]; then
5959
else
6060
rm -rf "${base_layer_dir}"
6161
echo "---> Skip generate base layer"
62-
fi
62+
fi

0 commit comments

Comments
 (0)