diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bad649c..13aa455 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,6 +21,12 @@ jobs: DOCKER_TOKEN: ${{secrets.DOCKER_TOKEN}} run: | docker login -u $DOCKER_USER -p $DOCKER_TOKEN + - name: Build 20.04 + run: | + docker build . --pull --build-arg OS_VERSION=20.04 --tag bshp/ocie:20.04 --no-cache + - name: Push 20.04 + run: | + docker push bshp/ocie:20.04 - name: Build 22.04 run: | docker build . --pull --build-arg OS_VERSION=${{env.STABLE_CHANNEL}} --tag bshp/ocie:latest --no-cache diff --git a/src/usr/lib/ocie/pkg b/src/usr/lib/ocie/pkg index 3a743f4..433d18c 100644 --- a/src/usr/lib/ocie/pkg +++ b/src/usr/lib/ocie/pkg @@ -31,6 +31,9 @@ function set_manifest() if [[ -f /bin/jq ]];then DB="$(mktemp -d)"; cp /var/lib/dpkg/status $DB/ >/dev/null 2>&1; + if [[ -d /var/lib/dpkg/updates ]];then + cp -R /var/lib/dpkg/updates $DB/ >/dev/null 2>&1; + fi; sed -i 's/"//g' $DB/status >/dev/null 2>&1; DPKG_FORMAT='\{\"name\"\:\"${binary:Package}\"\,\"version\"\:\"${Version}\"\,\"summary\"\:\"${binary:Summary}\"\,\"maintainer\"\:\"${Maintainer}\"\}\,'; DPKG_LIST=$(dpkg-query -W --admindir=$DB -f=$DPKG_FORMAT);