Upgrade to alpine 3.16.2
This commit is contained in:
parent
290b2765d3
commit
774df4d22b
8
.github/workflows/docker.yml
vendored
8
.github/workflows/docker.yml
vendored
@ -4,7 +4,7 @@ name: CI
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- 'master'
|
- 'main'
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
docker:
|
docker:
|
||||||
@ -12,16 +12,16 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
-
|
-
|
||||||
name: Set up Docker Buildx
|
name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v1
|
uses: docker/setup-buildx-action@v2
|
||||||
-
|
-
|
||||||
name: Login to DockerHub
|
name: Login to DockerHub
|
||||||
uses: docker/login-action@v1
|
uses: docker/login-action@v2
|
||||||
with:
|
with:
|
||||||
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
username: ${{ secrets.DOCKER_HUB_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_HUB_SECRET }}
|
password: ${{ secrets.DOCKER_HUB_SECRET }}
|
||||||
-
|
-
|
||||||
name: Checkout
|
name: Checkout
|
||||||
uses: actions/checkout@v2
|
uses: actions/checkout@v3
|
||||||
|
|
||||||
-
|
-
|
||||||
name: Build and Push from Makefile
|
name: Build and Push from Makefile
|
||||||
|
2
Makefile
2
Makefile
@ -1,6 +1,6 @@
|
|||||||
DOCKER_IMAGE_NAME = cubetiq/calpine-os-linux
|
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_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:
|
build:
|
||||||
./src/build.sh
|
./src/build.sh
|
||||||
|
@ -10,7 +10,8 @@ set -ex
|
|||||||
# Default args
|
# Default args
|
||||||
DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-calpine-os-linux}
|
DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-calpine-os-linux}
|
||||||
DOCKER_USERNAME="${DOCKER_USERNAME:-cubetiq}"
|
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"
|
PACKAGES="apk-tools ca-certificates ssl_client"
|
||||||
|
|
||||||
MKROOTFS="/tmp/alpine-make-rootfs"
|
MKROOTFS="/tmp/alpine-make-rootfs"
|
||||||
@ -26,7 +27,7 @@ $PRE_INSTALL
|
|||||||
|
|
||||||
# Build from alpine rootfs
|
# Build from alpine rootfs
|
||||||
# Download rootfs builder and verify it.
|
# 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 -
|
echo "c9cfea712709df162f4dcf26e2b1422aadabad43 $MKROOTFS" | sha1sum -c -
|
||||||
chmod +x ${MKROOTFS}
|
chmod +x ${MKROOTFS}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user