File tree Expand file tree Collapse file tree 3 files changed +8
-5
lines changed
Expand file tree Collapse file tree 3 files changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ RPM_DISTROS ?= suse-15-x86_64 suse-16-x86_64
1818RPM_ARCH := x86_64
1919REDHAT_VERSIONS ?= redhatenterprise-8 redhatenterprise-9 redhatenterprise-10
2020REDHAT_ARCHS ?= aarch64 x86_64
21- APK_VERSIONS ?= 3.20 3.21 3.22
21+ APK_VERSIONS ?= 3.20 3.21 3.22 3.23
2222APK_ARCHS ?= aarch64 x86_64
2323APK_REVISION ?= 1
2424AMAZON_VERSIONS ?= amazon-2 amazon-2023
@@ -35,7 +35,7 @@ $(PACKAGES_DIR):
3535 @mkdir -p $(PACKAGES_DIR ) /deb && mkdir -p $(PACKAGES_DIR ) /rpm && mkdir -p $(PACKAGES_DIR ) /apk
3636
3737.PHONY : package
38- package : gpg-key $(PACKAGES_DIR ) # ### Create final packages for all supported distros
38+ package : $(PACKAGES_DIR ) # ### Create final packages for all supported distros
3939# Build binaries for all supported architectures
4040 @for arch in $(DEB_ARCHS); do \
4141 mkdir -p $(BUILD_DIR)/$${arch}; \
Original file line number Diff line number Diff line change @@ -77,7 +77,10 @@ echo "${FOUND[@]}" | sed 's/ /\n/g'
7777for tag in " ${FOUND[@]} " ; do
7878 echo " :: ${IMAGE_PATH} :$tag "
7979 ${CONTAINER_TOOL} pull ${IMAGE_PATH} :$tag > /dev/null 2>&1
80- ${CONTAINER_TOOL} run ${IMAGE_PATH} :$tag nginx -v
81- ${CONTAINER_TOOL} run --rm ${IMAGE_PATH} :$tag nginx-agent --version | sed ' s/version/version:/g' # --rm to clean up container after run
80+ echo -n " :::: " ; ${CONTAINER_TOOL} run ${IMAGE_PATH} :$tag cat /etc/os-release | grep PRETTY_NAME | awk -F' =' ' {print $2}' | tr -d ' "' \
81+ || echo " No /etc/os-release found"
82+ echo -n " :::: " ; ${CONTAINER_TOOL} run ${IMAGE_PATH} :$tag nginx -v
83+ echo -n " :::: " ; ${CONTAINER_TOOL} run --rm ${IMAGE_PATH} :$tag nginx-agent --version | sed ' s/version/version:/g' # --rm to clean up container after run
84+ echo
8285done
8386
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ majorVersion=$(echo ${VERSION} | cut -d. -f1)
6262# Define package URIs to check for each platform
6363
6464APK=()
65- ALPINE_VERSIONS=(" 3.22" " 3.21" " 3.20" )
65+ ALPINE_VERSIONS=(" 3.23 " " 3. 22" " 3.21" " 3.20" )
6666ALPINE_ARCH=(" x86_64" " aarch64" )
6767for alpine_version in " ${ALPINE_VERSIONS[@]} " ; do
6868 for arch in ${ALPINE_ARCH[@]} ; do
You can’t perform that action at this time.
0 commit comments