From 5fc36516f4160543b52614daa4e11324a55dd7b1 Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Fri, 21 May 2021 07:39:59 -0500
Subject: [PATCH] ci: switch 'latest/master' build to multiarch

---
 .github/workflows/build-multiarch.yml | 2 ++
 .github/workflows/main.yml            | 2 --
 Dockerfile                            | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index f6fc020f..9475222d 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.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"
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 6d74d3e5..d402dcdc 100644
--- a/.github/workflows/main.yml
+++ b/.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"
diff --git a/Dockerfile b/Dockerfile
index 669fd26f..c74276c1 100644
--- a/Dockerfile
+++ b/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 \