Commit 6536b299 authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge branch 'fix-multi-arch-manifests' into 'main' 

Fix multi-arch manifests

See merge request !2
parents cb0ef156 b6dba204

.gitlab-ci.yml

+7 −1
Original line number Diff line number Diff line 
variables:

  TARGET_PLATFORMS:

    description: Docker/OCI platform specifiers to build images for;

      comma separated



stages:

- check

- build
@@ -38,6 +43,7 @@ Checks: 
    --local dockerfile=.

    --opt target=$TARGET

    --output=type=image,name=$CI_REGISTRY_IMAGE/$TARGET:build-$CI_PIPELINE_IID,push=true

    ${TARGET_PLATFORMS:+--opt platform=$TARGET_PLATFORMS}

    ${REVISION:+--opt build-arg:REVISION=$REVISION}

    ${VERSION:+--opt build-arg:VERSION=$VERSION}
@@ -64,7 +70,7 @@ Build "buildctl": 


Deploy Images:

  stage: deploy

  image: docker.kodo.org.uk/ci-images/docker-reg:latest

  image: docker.kodo.org.uk/ci-images/docker-reg:0.2.0

  rules:

  - if: $CI_COMMIT_TAG =~ /^v[0-9]/

  script:

Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


ARG VERSION



FROM --platform=$BUILDPLATFORM golang:1.17-alpine as go

FROM --platform=$BUILDPLATFORM golang:1.18-alpine as go



# Get source code

WORKDIR /src