Compare commits

...

2 Commits

Author SHA1 Message Date
290b2765d3
Fixed apline build rootfs 2021-12-23 09:31:19 +07:00
dc9f5d46b3
Add apline os 3.15 2021-12-23 09:10:40 +07:00
2 changed files with 4 additions and 13 deletions

View File

@ -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.13
DOCKER_IMAGE=${DOCKER_IMAGE_NAME}:3.15
build:
./src/build.sh

View File

@ -10,7 +10,7 @@ set -ex
# Default args
DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-calpine-os-linux}
DOCKER_USERNAME="${DOCKER_USERNAME:-cubetiq}"
ALPINE_VERSION="${ALPINE_VERSION:-3.13}"
ALPINE_VERSION="${ALPINE_VERSION:-3.15}"
PACKAGES="apk-tools ca-certificates ssl_client"
MKROOTFS="/tmp/alpine-make-rootfs"
@ -20,16 +20,14 @@ PRE_INSTALL="./src/pre-install.sh"
POST_INSTALL="./src/post-install.sh"
mkdir -p $DOCKER_ROOT
MS_ROOT="${DOCKER_ROOT}/microscanner"
mkdir -p $MS_ROOT
# Load pre-install
$PRE_INSTALL
# Build from alpine rootfs
# Download rootfs builder and verify it.
wget https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/v0.5.1/alpine-make-rootfs -O "$MKROOTFS"
echo "a7159f17b01ad5a06419b83ea3ca9bbe7d3f8c03 $MKROOTFS" | sha1sum -c -
wget https://raw.githubusercontent.com/alpinelinux/alpine-make-rootfs/v0.6.0/alpine-make-rootfs -O "$MKROOTFS"
echo "c9cfea712709df162f4dcf26e2b1422aadabad43 $MKROOTFS" | sha1sum -c -
chmod +x ${MKROOTFS}
sudo ${MKROOTFS} --mirror-uri http://dl-2.alpinelinux.org/alpine \
@ -56,12 +54,5 @@ cd -
docker build --build-arg BASE_IMAGE="${DOCKER_USERNAME}/${DOCKER_IMAGE_NAME}:${ALPINE_VERSION}" --build-arg MS_TOKEN="${MS_TOKEN}" - <<'DOCKERFILE'
ARG BASE_IMAGE
FROM $BASE_IMAGE
ARG MS_TOKEN
# RUN wget https://get.aquasec.com/microscanner -O /home/cubetiq/microscanner \
# && echo "8e01415d364a4173c9917832c2e64485d93ac712a18611ed5099b75b6f44e3a5 /home/cubetiq/microscanner" | sha256sum -c - \
# && chmod +x /home/cubetiq/microscanner \
# && /home/cubetiq/microscanner $MS_TOKEN \
# && rm -r /home/cubetiq/microscanner
DOCKERFILE