ci: switch 'latest/master' build to multiarch

.github/workflows/build-multiarch.yml

@@ -2,12 +2,14 @@ name: Build and publish multiarch
 on:
   push:
     branches:
+      - latest
       - multiarch
       - multiarch-latest
       - java15
       - java16
       - test/multiarch/*
     tags:
+      - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
       - "[0-9]+.[0-9]+.[0-9]+-java15"

.github/workflows/main.yml

@@ -3,14 +3,12 @@ name: Build and Publish
 on:
   push:
     branches:
-      - master
       - java8
       - openj9
       - openj9-11
       - adopt11
       - test/*
     tags:
-      - "[0-9]+.[0-9]+.[0-9]+"
       - "[0-9]+.[0-9]+.[0-9]+-java8"
       - "[0-9]+.[0-9]+.[0-9]+-openj9"
       - "[0-9]+.[0-9]+.[0-9]+-openj9-11"

Dockerfile

@@ -1,7 +1,5 @@
 FROM adoptopenjdk:16-jre
 
-ENV APK_UPDATE=20210521
-
 LABEL org.opencontainers.image.authors="Geoff Bourne <itzgeoff@gmail.com>"
 
 RUN apt-get update \