Skip to content

Commit 391f45b

Browse files
committed
fix(base): docker 24 import error
1 parent e3213a6 commit 391f45b

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

Makefile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
DEV_REGISTRY ?= registry.drycc.cc
22
DRYCC_REGISTRY ?= ${DEV_REGISTRY}
33
IMAGE = "${DRYCC_REGISTRY}"/drycc/base:"${CODENAME}"-"$(shell dpkg --print-architecture)"
4+
BASE_LAYER = "${IMAGE}"-prebuild
45
WORK_DIR = /workspace/"${CODENAME}"
56

67
SHELLCHECK_PREFIX := docker run --rm -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}/drycc/go-dev shellcheck
@@ -14,10 +15,13 @@ clean:
1415
mkimage:
1516
./scripts/mkimage.sh minbase "${CODENAME}"
1617

17-
docker-build: mkimage
18+
docker-import:
19+
@docker import ${WORK_DIR}.tar.gz ${BASE_LAYER}
20+
21+
docker-build: mkimage docker-import
1822
@docker build . \
1923
--tag ${IMAGE} \
20-
--build-arg BASE_LAYER=$(shell docker import ${WORK_DIR}.tar.gz) \
24+
--build-arg BASE_LAYER=${BASE_LAYER} \
2125
--file Dockerfile
2226

2327
docker-immutable-push: test-style build

0 commit comments

Comments
 (0)