From 774df4d22b6da2c36ed37f2b2581ede2dadd2049 Mon Sep 17 00:00:00 2001
From: Sambo Chea <sombochea@cubetiqs.com>
Date: Tue, 27 Sep 2022 20:53:46 +0700
Subject: [PATCH] Upgrade to alpine 3.16.2

---
 .github/workflows/docker.yml | 8 ++++----
 Makefile                     | 2 +-
 src/build.sh                 | 5 +++--
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5342193..657b968 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -4,7 +4,7 @@ name: CI
 on:
   push:
     branches:
-      - 'master'
+      - 'main'
 
 jobs:
   docker:
@@ -12,16 +12,16 @@ jobs:
     steps:
       -
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_HUB_USERNAME }}
           password: ${{ secrets.DOCKER_HUB_SECRET }}
       -
         name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         
       -
         name: Build and Push from Makefile
diff --git a/Makefile b/Makefile
index f9d222e..8be9e7a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 DOCKER_IMAGE_NAME = cubetiq/calpine-os-linux
 DOCKER_IMAGE_SIZE = $(shell docker images --format "{{.Repository}} {{.Size}}" | grep $(DOCKER_IMAGE_NAME) | cut -d\   -f2)
-DOCKER_IMAGE=${DOCKER_IMAGE_NAME}:3.15
+DOCKER_IMAGE=${DOCKER_IMAGE_NAME}:3.16
 
 build:
 	./src/build.sh
diff --git a/src/build.sh b/src/build.sh
index da5a72f..e6bfee2 100755
--- a/src/build.sh
+++ b/src/build.sh
@@ -10,7 +10,8 @@ set -ex
 # Default args
 DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-calpine-os-linux}
 DOCKER_USERNAME="${DOCKER_USERNAME:-cubetiq}"
-ALPINE_VERSION="${ALPINE_VERSION:-3.15}"
+ALPINE_VERSION="${ALPINE_VERSION:-3.16.2}"
+ALPINE_MAKE_ROOTFS_VERSION="${ALPINE_MAKE_ROOTFS_VERSION:-0.6.1}"
 PACKAGES="apk-tools ca-certificates ssl_client"
 
 MKROOTFS="/tmp/alpine-make-rootfs"
@@ -26,7 +27,7 @@ $PRE_INSTALL
 
 # Build from alpine rootfs
 # Download rootfs builder and verify it.
-wget https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/v0.6.0/alpine-make-rootfs -O "$MKROOTFS"
+wget https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/v${ALPINE_MAKE_ROOTFS_VERSION}/alpine-make-rootfs -O "$MKROOTFS"
 echo "c9cfea712709df162f4dcf26e2b1422aadabad43 $MKROOTFS" | sha1sum -c -
 chmod +x ${MKROOTFS}