From f2ab9c618d598ce952829cdafe55302633f56ff6 Mon Sep 17 00:00:00 2001 From: Florian Schwab Date: Sun, 2 Jun 2019 03:05:23 +0200 Subject: [PATCH] build arm64 version --- .gitlab-ci.yml | 16 ++++++++++++++-- Dockerfile | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b51f47f..4d59978 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,7 +7,7 @@ stages: - release variables: - QEMU_VERSION: v3.1.0-2 + QEMU_VERSION: v4.0.0 before_script: - mkdir -p /root/.docker || true @@ -30,6 +30,14 @@ build-arm32v7: - docker build --build-arg ARCH=arm32v7 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7 . - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7 +build-arm64: + stage: build + script: + - wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_VERSION}/qemu-aarch64-static -O qemu-arm-static + - chmod 554 qemu-aarch64-static + - docker build --build-arg ARCH=arm64 -t ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64 . + - docker push ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64 + release: stage: release script: @@ -62,9 +70,13 @@ dockerhub: - docker pull ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7 - docker tag ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm32v7 ${DOCKERHUB_IMAGE}:latest-arm32v7 - docker push ${DOCKERHUB_IMAGE}:latest-arm32v7 - - docker manifest create ${DOCKERHUB_IMAGE}:latest ${DOCKERHUB_IMAGE}:latest-amd64 ${DOCKERHUB_IMAGE}:latest-arm32v7 + - docker pull ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64 + - docker tag ${CI_REGISTRY_IMAGE}:${CI_PIPELINE_ID}-arm64 ${DOCKERHUB_IMAGE}:latest-arm64 + - docker push ${DOCKERHUB_IMAGE}:latest-arm64 + - docker manifest create ${DOCKERHUB_IMAGE}:latest ${DOCKERHUB_IMAGE}:latest-amd64 ${DOCKERHUB_IMAGE}:latest-arm32v7 ${DOCKERHUB_IMAGE}:latest-arm64 - docker manifest annotate --os linux --arch amd64 ${DOCKERHUB_IMAGE}:latest ${DOCKERHUB_IMAGE}:latest-amd64 - docker manifest annotate --os linux --arch arm --variant v7 ${DOCKERHUB_IMAGE}:latest ${DOCKERHUB_IMAGE}:latest-arm32v7 + - docker manifest annotate --os linux --arch arm64 ${DOCKERHUB_IMAGE}:latest ${DOCKERHUB_IMAGE}:latest-arm64 - docker manifest push ${DOCKERHUB_IMAGE}:latest only: - master diff --git a/Dockerfile b/Dockerfile index 03bf531..1fac4fe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ MAINTAINER Florian Schwab # upgrade system RUN apk --no-cache --no-progress upgrade -# install avahi +# install packages RUN apk --no-cache --no-progress add avahi avahi-tools # disable d-bus