krd/angie-conv-image
1
0
Fork 0
Code

bump Angie version

Browse Source 
adjust versions across scripts/dockerfiles
This commit is contained in:
Konstantin Demin 2024-09-20 02:07:12 +03:00
parent 026fe8757e
commit 62eeabff2b
Signed by: krd
GPG Key ID: 4D56F87A8BA65FD0
5 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -1,4 +1,5 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.1-deps AS deps ARG IMAGE_VERSION
FROM docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-deps AS deps
## --- ## ---
@ -109,7 +110,7 @@ RUN apt-install.sh angie ; \
fi fi
## preserve snippets from Angie config directory ## preserve snippets from Angie config directory
## ref: https://git.angie.software/web-server/angie/src/tag/Angie-1.6.2/conf ## ref: https://git.angie.software/web-server/angie/src/tag/Angie-1.7.0/conf
RUN d=/etc/angie ; t=$(mktemp -d) ; \ RUN d=/etc/angie ; t=$(mktemp -d) ; \
tar -C "$d" -cf - \ tar -C "$d" -cf - \
fastcgi_params \ fastcgi_params \

3
Dockerfile.deps
View File

@ -1,4 +1,5 @@
FROM docker.io/rockdrilla/angie-conv:v0.0.1-base AS base ARG IMAGE_VERSION
FROM docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-base AS base
## --- ## ---

4
build-scripts/image-base.sh
View File

@ -2,6 +2,8 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.1}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"
BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
@ -27,7 +29,7 @@ grab_site_packages() {
PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}") PYTHON_SITE_PACKAGES=$(grab_site_packages "docker.io/python:${PYTHONTAG}")
[ -n "${PYTHON_SITE_PACKAGES:?}" ] [ -n "${PYTHON_SITE_PACKAGES:?}" ]
img="docker.io/rockdrilla/angie-conv:v0.0.1-base" img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-base"
buildah bud --network="${BUILDAH_NETWORK}" \ buildah bud --network="${BUILDAH_NETWORK}" \
-f ./Dockerfile.base \ -f ./Dockerfile.base \

7
build-scripts/image-deps.sh
View File

@ -2,15 +2,18 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.1}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"
BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
set +a set +a
img="docker.io/rockdrilla/angie-conv:v0.0.1-deps" img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-deps"
exec buildah bud \ exec buildah bud \
-f ./Dockerfile.deps \ -f ./Dockerfile.deps \
-t "${img}" \ -t "${img}" \
--pull=missing --no-cache --pull=missing --no-cache \
--build-arg "IMAGE_VERSION=${IMAGE_VERSION}" \

13
build-scripts/image.sh
View File

@ -2,13 +2,15 @@
set -ef set -ef
cd "$(dirname "$0")/.." cd "$(dirname "$0")/.."
IMAGE_VERSION="${IMAGE_VERSION:-v0.0.1}"
set -a set -a
BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}" BUILDAH_FORMAT="${BUILDAH_FORMAT:-docker}"
BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}" BUILDAH_ISOLATION="${BUILDAH_ISOLATION:-chroot}"
BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}" BUILDAH_NETWORK="${BUILDAH_NETWORK:-host}"
set +a set +a
ANGIE_VERSION="${ANGIE_VERSION:-1.6.2}" ANGIE_VERSION="${ANGIE_VERSION:-1.7.0}"
## likely the same as in https://pkg.go.dev/strconv#ParseBool ## likely the same as in https://pkg.go.dev/strconv#ParseBool
gobool_to_int() { gobool_to_int() {
@ -21,10 +23,10 @@ gobool_to_int() {
esac esac
} }
NGX_DEBUG=$(gobool_to_int "${1:-0}" 0) NGX_DEBUG=$(gobool_to_int "${NGX_DEBUG:-0}" 0)
case "${NGX_DEBUG}" in case "${NGX_DEBUG}" in
0 ) img="docker.io/rockdrilla/angie-conv:v0.0.1-${ANGIE_VERSION}" ;; 0 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}" ;;
1 ) img="docker.io/rockdrilla/angie-conv:v0.0.1-${ANGIE_VERSION}-debug" ;; 1 ) img="docker.io/rockdrilla/angie-conv:${IMAGE_VERSION}-${ANGIE_VERSION}-debug" ;;
esac esac
exec buildah bud \ exec buildah bud \
@ -32,4 +34,5 @@ exec buildah bud \
-t "${img}" \ -t "${img}" \
--env "ANGIE_VERSION=${ANGIE_VERSION}" \ --env "ANGIE_VERSION=${ANGIE_VERSION}" \
--env "NGX_DEBUG=${NGX_DEBUG}" \ --env "NGX_DEBUG=${NGX_DEBUG}" \
--pull=missing --no-cache --pull=missing --no-cache \
--build-arg "IMAGE_VERSION=${IMAGE_VERSION}" \