tests/pkg: Update remaining builds to pkg/package.mk

Also update the base tools/alpine to latest.

Signed-off-by: Ian Campbell <ijc@docker.com>

test/pkg/containerd/Dockerfile

@@ -1,4 +1,4 @@
-FROM linuxkit/alpine:24fe1b6bbf1fc95b484741587acb10da6dbc9211 AS mirror
+FROM linuxkit/alpine:34af9cb1990debd17fae6d4198c62ce3910d9908 AS mirror
 RUN mkdir -p /out/etc/apk && cp -r /etc/apk/* /out/etc/apk/
 # btrfs-progfs is required for btrfs test (mkfs.btrfs)
 # util-linux is required for btrfs test (losetup)

test/pkg/containerd/Makefile

@@ -1,15 +1,5 @@
-.PHONY: tag push
-default: push
-
-ORG?=linuxkit
 IMAGE=test-containerd
-DEPS=Dockerfile Makefile run.sh
+DEPS=run.sh
+NETWORK=1
 
-HASH?=$(shell git ls-tree HEAD -- ../$(notdir $(CURDIR)) | awk '{print $$3}')
-
-tag: $(DEPS)
-	docker build --squash --no-cache -t $(ORG)/$(IMAGE):$(HASH) .
-
-push: tag
-	DOCKER_CONTENT_TRUST=1 docker pull $(ORG)/$(IMAGE):$(HASH) || \
-	DOCKER_CONTENT_TRUST=1 docker push $(ORG)/$(IMAGE):$(HASH)
+include ../../../pkg/package.mk