diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index bd7cb5e6..270d5ea9 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -105,12 +105,18 @@ jobs: echo "CHR_VERSION=$CHR_VERSION" >> $GITHUB_ENV fi + - name: Download regctl + shell: bash + run: | + curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl + chmod 755 regctl + - name: Building build-deps container ${{ env.VERSION }} shell: bash run: | IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/build-deps:$CHR_VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$CHR_VERSION \ --progress plain \ @@ -129,7 +135,7 @@ jobs: run: | IS_PRESENT=$(docker inspect --type=image uazo/chromium:$CHR_VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/chromium:$CHR_VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$CHR_VERSION \ --progress plain \ diff --git a/.github/workflows/build_cromite.yaml b/.github/workflows/build_cromite.yaml index f9d84c09..ad1d9e5f 100644 --- a/.github/workflows/build_cromite.yaml +++ b/.github/workflows/build_cromite.yaml @@ -65,6 +65,12 @@ jobs: sudo iptables -D INPUT -p tcp --dport 8118 -j DROP fi + - name: Download regctl + shell: bash + run: | + curl -L https://github.com/regclient/regclient/releases/latest/download/regctl-linux-amd64 >regctl + chmod 755 regctl + - name: Get current chromium version shell: bash run: | @@ -80,7 +86,7 @@ jobs: run: | IS_PRESENT=$(docker inspect --type=image uazo/build-deps:$VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/build-deps:$VERSION > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/build-deps:$VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/build-deps:$VERSION \ --progress plain \ @@ -96,7 +102,7 @@ jobs: run: | IS_PRESENT=$(docker inspect --type=image uazo/chromium:$VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/chromium:$VERSION > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/chromium:$VERSION > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/chromium:$VERSION \ --progress plain \ @@ -111,7 +117,7 @@ jobs: run: | IS_PRESENT=$(docker inspect --type=image uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/cromite:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/cromite:$VERSION-$CROMITE_SHA --progress plain \ --build-arg CROMITE_SHA=$CROMITE_SHA \ @@ -126,7 +132,7 @@ jobs: run: | IS_PRESENT=$(docker inspect --type=image uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then - IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) if [ $IS_PRESENT -ne "0" ]; then DOCKER_BUILDKIT=1 docker build -t uazo/cromite-build:$VERSION-$CROMITE_SHA --progress plain \ --build-arg CROMITE_SHA=$CROMITE_SHA \ @@ -140,7 +146,7 @@ jobs: - name: Get uazo/cromite-build from docker hub if present shell: bash run: | - IS_PRESENT=$(docker manifest inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) + IS_PRESENT=$(./regctl image inspect uazo/cromite-build:$VERSION-$CROMITE_SHA > /dev/null ; echo $?) if [ $IS_PRESENT -eq "0" ]; then docker pull uazo/cromite-build:$VERSION-$CROMITE_SHA fi