Build amd64/arm64 multiarch images

Signed-off-by: Adam Dodman <adam@adam-ant.co.uk>
Signed-off-by: Joe Groocock <me@frebib.net>

.drone.star

@@ -0,0 +1,106 @@
+repo = "spritsail/alpine"
+archs = ["amd64", "arm64"]
+versions = ["edge", "3.14", "3.15", "3.16"]
+branches = ["master"]
+
+def main(ctx):
+  builds = []
+
+  for ver in versions:
+    depends_on = []
+    srctpl = "drone/%s/${DRONE_BUILD_NUMBER}:%s-ARCH" % (ctx.repo.slug, ver)
+    for arch in archs:
+      key = "build-%s-%s" % (ver, arch)
+      tmprepo = "drone/%s/${DRONE_BUILD_NUMBER}:%s-%s" % (ctx.repo.slug, ver, arch)
+      builds.append(step(ver, arch, key, tmprepo))
+      depends_on.append(key)
+
+    if ctx.build.branch in branches:
+      tags = []
+      if ver == versions[-1]:
+        tags.append("latest")
+      builds.append(publish(ver, srctpl, depends_on, tags))
+
+  return builds
+
+def step(ver, arch, key, tmprepo):
+  vertest = "grep -q '%s' /etc/alpine-release && " % ver if ver != "edge" else ""
+  return {
+    "kind": "pipeline",
+    "name": key,
+    "platform": {
+      "os": "linux",
+      "arch": arch,
+    },
+    "steps": [
+      {
+        "name": "build",
+        "image": "spritsail/docker-build",
+        "pull": "always",
+        "settings": {
+          "build_args": [
+            "ALPINE_TAG=%s" % ver,
+          ],
+          "repo": tmprepo,
+        },
+      },
+      {
+        "name": "test",
+        "image": "spritsail/docker-test",
+        "pull": "always",
+        "settings": {
+          "run": vertest + "su-exec nobody apk --version",
+          "repo": tmprepo,
+        },
+      },
+      {
+        "name": "publish",
+        "image": "spritsail/docker-publish",
+        "pull": "always",
+        "settings": {
+          "from": tmprepo,
+          "repo": tmprepo,
+          "registry": {"from_secret": "registry_url"},
+          "username": {"from_secret": "registry_username"},
+          "password": {"from_secret": "registry_password"},
+        },
+        "when": {
+          "branch": branches,
+          "event": ["push"],
+        },
+      },
+    ]
+  }
+
+def publish(ver, srctpl, depends, tags=[]):
+  return {
+    "kind": "pipeline",
+    "name": "publish-%s" % ver,
+    "depends_on": depends,
+    "platform": {
+      "os": "linux",
+    },
+    "steps": [
+      {
+        "name": "publish",
+        "image": "spritsail/docker-multiarch-publish",
+        "pull": "always",
+        "settings": {
+          "src_template": srctpl,
+          "src_registry": {"from_secret": "registry_url"},
+          "src_username": {"from_secret": "registry_username"},
+          "src_password": {"from_secret": "registry_password"},
+          "dest_repo": repo,
+          "dest_username": {"from_secret": "docker_username"},
+          "dest_password": {"from_secret": "docker_password"},
+          "tags": [ver] + tags,
+        },
+        "when": {
+          "branch": branches,
+          "event": ["push"],
+        },
+      },
+    ]
+  }
+
+# vim: ft=python sw=2

.drone.yml

@@ -1,35 +0,0 @@
-pipeline:
-  build:
-    image: spritsail/docker-build
-    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
-    repo: alpine-dev
-    build_args:
-      - ALPINE_TAG=${ALPINE_TAG%%,*}
-
-  test:
-    image: docker
-    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
-    commands:
-      - docker run --rm alpine-dev /bin/sh -xec 'apk --version'
-
-  publish:
-    image: spritsail/docker-publish
-    when: { branch: [ master ], event: [ push, tag, deployment ] }
-    volumes: [ '/var/run/docker.sock:/var/run/docker.sock' ]
-    secrets: [ docker_username, docker_password, microbadger_token ]
-    from: alpine-dev
-    repo: 'spritsail/alpine'
-    tags: ${ALPINE_TAG}
-
-  notify:
-    image: spritsail/notify
-    when: { status: [ success, failure ] }
-    secrets: [ webhook_url, notify_token ]
-
-matrix:
-  ALPINE_TAG:
-    - 3.4
-    - 3.5
-    - 3.6
-    - 3.7,latest
-    - edge

Dockerfile

@@ -1,9 +1,7 @@
-ARG SU_EXEC_VER=v0.3
-ARG ALPINE_TAG=3.7
+ARG ALPINE_TAG=3.16
 
 FROM alpine:$ALPINE_TAG
 
-ARG SU_EXEC_VER
 ARG ALPINE_TAG
 
 LABEL maintainer="Spritsail <alpine@spritsail.io>" \
@@ -11,19 +9,18 @@ LABEL maintainer="Spritsail <alpine@spritsail.io>" \
       org.label-schema.name="Alpine Linux" \
       org.label-schema.url="https://github.com/gliderlabs/docker-alpine" \
       org.label-schema.description="Alpine Linux base image" \
-      org.label-schema.version=${ALPINE_TAG} \
-      io.spritsail.version.su-exec=${SU_EXEC_VER}
+      org.label-schema.version=${ALPINE_TAG}
 
 # Override shell for sh-y debugging goodness
 SHELL ["/bin/sh", "-exc"]
 
 COPY skel/ /
+ADD https://alpine.spritsail.io/spritsail-alpine.rsa.pub /etc/apk/keys
+
 ENV ENV="/etc/profile"
-RUN apk --no-cache add \
-        tini \
-        openssl \
- && wget -qO /sbin/su-exec https://github.com/frebib/su-exec/releases/download/${SU_EXEC_VER}/su-exec-alpine-$(uname -m) \
- && chmod +x /sbin/su-exec \
- && apk --no-cache del openssl
+RUN sed -i '1ihttps://alpine.spritsail.io/spritsail' /etc/apk/repositories \
+ && apk --no-cache add \
+        su-exec \
+        tini
 
 ENTRYPOINT ["/sbin/tini" , "--"]

skel/etc/profile

@@ -1,6 +1,6 @@
-export PAGER='/usr/bin/less -R'
+export PAGER='/usr/bin/less'
 export EDITOR='/usr/bin/vi'
-export PS1='\e[1;36m\u@\h\e[0m \e[0;32m$(pwd | sed -E '"'s|^'\$HOME'|~|;s|(.*)/|\\1%#|;s|((^\\|/)\\.?[^/%]{1})[^/%]*|\\1|g;s|(.*)%#|\\1/|')"'\e[0m> '
+export PS1='\e[1;36m\u@\h\e[0m \e[0;32m$(pwd | sed -E '"'s@^'\$HOME'@~@;s@(.*)/@\\1%#@;s@((^|/)\\.?[^/%]{1})[^/%]*@\\1@g;s@(.*)%#@\\1/@')"'\e[0m> '
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do