github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #5416 from dims/add-multi-arch-support-for-test-images-take-2

Browse Source 
Add multi-arch support for test images
This commit is contained in:
Phil Estes 2021-04-23 16:05:57 -04:00 committed by GitHub
commit ca6a41915a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
integration/images/volume-copy-up/Makefile
View File

@ -15,13 +15,20 @@
all: build all: build
PROJ=gcr.io/k8s-cri-containerd PROJ=gcr.io/k8s-cri-containerd
VERSION=1.0 VERSION=2.0
IMAGE=$(PROJ)/volume-copy-up:$(VERSION) IMAGE=$(PROJ)/volume-copy-up:$(VERSION)
PLATFORMS?=linux/amd64,linux/arm64
configure-docker:
gcloud auth configure-docker
build: build:
docker build -t $(IMAGE) . docker buildx build \
$(OUTPUT) \
--platform=${PLATFORMS} \
--tag $(IMAGE) .
push: push: OUTPUT=--push
gcloud docker -- push $(IMAGE) push: configure-docker build
.PHONY: build push .PHONY: configure-docker build push

2
integration/images/volume-ownership/Dockerfile
View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
FROM busybox FROM ubuntu
RUN mkdir -p /test_dir && \ RUN mkdir -p /test_dir && \
chown -R nobody:nogroup /test_dir chown -R nobody:nogroup /test_dir
VOLUME /test_dir VOLUME /test_dir

17
integration/images/volume-ownership/Makefile
View File

@ -15,13 +15,20 @@
all: build all: build
PROJ=gcr.io/k8s-cri-containerd PROJ=gcr.io/k8s-cri-containerd
VERSION=1.0 VERSION=2.0
IMAGE=$(PROJ)/volume-ownership:$(VERSION) IMAGE=$(PROJ)/volume-ownership:$(VERSION)
PLATFORMS?=linux/amd64,linux/arm64
configure-docker:
gcloud auth configure-docker
build: build:
docker build -t $(IMAGE) . docker buildx build \
$(OUTPUT) \
--platform=${PLATFORMS} \
--tag $(IMAGE) .
push: push: OUTPUT=--push
gcloud docker -- push $(IMAGE) push: configure-docker build
.PHONY: build push .PHONY: configure-docker build push