From cb883276d7474ddd26d4787c2208933b3497ffa3 Mon Sep 17 00:00:00 2001
From: Andrew Cutler <andrew@panubo.com>
Date: Wed, 31 May 2023 16:07:19 +1000
Subject: [PATCH] Renovation Alpine 3.18 and ARM32 builds (#81)

* Upgrade Alpine base 3.18, and dont cache apk
* Add arm32v6 and arm32v7 builds.
* Add noop test target to Makefile
---
 .github/workflows/build-push.yml | 2 +-
 Dockerfile                       | 4 ++--
 LICENSE                          | 2 +-
 Makefile                         | 3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml
index 19d898d..6551bf0 100644
--- a/.github/workflows/build-push.yml
+++ b/.github/workflows/build-push.yml
@@ -110,6 +110,6 @@ jobs:
           push: ${{ github.event_name != 'pull_request' }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
index 2b30489..616b7db 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
-FROM alpine:3.14
+FROM alpine:3.18
 
 RUN apk update && \
-    apk add bash git openssh rsync augeas shadow rssh && \
+    apk add --no-cache bash git openssh rsync augeas shadow rssh && \
     deluser $(getent passwd 33 | cut -d: -f1) && \
     delgroup $(getent group 33 | cut -d: -f1) 2>/dev/null || true && \
     mkdir -p ~root/.ssh /etc/authorized_keys && chmod 700 ~root/.ssh/ && \
diff --git a/LICENSE b/LICENSE
index 7aac62a..04f0333 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 Volt Grid Pty Ltd
+Copyright (c) 2015-2023 Volt Grid Pty Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/Makefile b/Makefile
index d630937..cd97738 100644
--- a/Makefile
+++ b/Makefile
@@ -20,3 +20,6 @@ push: ## Pushes the docker image to hub.docker.com
 clean: ## Remove built images
 	docker rmi $(IMAGE_NAME):latest || true
 	docker rmi $(IMAGE_NAME):$(TAG) || true
+
+_ci_test:
+	echo "NOOP"