From faa215c5854d06fef325e08312ec537f4ef07f8c Mon Sep 17 00:00:00 2001 From: Vladimir Smirnov Date: Tue, 15 Oct 2024 00:07:55 +0200 Subject: [PATCH] Support patch releases in all build files and add ubuntu 24.04 --- docker/centos-7/Dockerfile | 7 ++++-- docker/debian-bookworm/Dockerfile | 4 +-- docker/debian-bookworm/create_package_deb.sh | 2 +- docker/debian-bookworm/pack.sh | 2 +- docker/debian-bullseye/Dockerfile | 4 +-- docker/debian-bullseye/create_package_deb.sh | 2 +- docker/debian-bullseye/pack.sh | 2 +- docker/debian-buster/Dockerfile | 4 +-- docker/debian-buster/create_package_deb.sh | 4 +-- docker/debian-buster/pack.sh | 2 +- docker/debian-trixie/Dockerfile | 4 +-- docker/debian-trixie/create_package_deb.sh | 2 +- docker/debian-trixie/pack.sh | 2 +- docker/rebuild.sh | 2 +- docker/rockylinux-8/Dockerfile | 4 +-- docker/rockylinux-8/create_package_rpm.sh | 2 +- docker/rockylinux-8/pack.sh | 2 +- docker/rockylinux-9/Dockerfile | 4 +-- docker/rockylinux-9/create_package_rpm.sh | 2 +- docker/rockylinux-9/pack.sh | 26 +++++--------------- docker/ubuntu-1804/Dockerfile | 4 +-- docker/ubuntu-1804/create_package_deb.sh | 2 +- docker/ubuntu-1804/pack.sh | 2 +- docker/ubuntu-2004/Dockerfile | 4 +-- docker/ubuntu-2004/create_package_deb.sh | 2 +- docker/ubuntu-2004/pack.sh | 2 +- docker/ubuntu-2204/Dockerfile | 4 +-- docker/ubuntu-2204/create_package_deb.sh | 2 +- docker/ubuntu-2204/pack.sh | 2 +- 29 files changed, 48 insertions(+), 59 deletions(-) diff --git a/docker/centos-7/Dockerfile b/docker/centos-7/Dockerfile index 648fec0..d94592d 100644 --- a/docker/centos-7/Dockerfile +++ b/docker/centos-7/Dockerfile @@ -3,7 +3,10 @@ MAINTAINER Vladimir Smirnov USER root # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 +RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/CentOS-*.repo +RUN sed -i 's/^#.*baseurl=http/baseurl=http/g' /etc/yum.repos.d/CentOS-*.repo +RUN sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/CentOS-*.repo RUN yum upgrade -y RUN yum install -y git openssh cairo-devel mercurial wget redhat-lsb-core openssh-server which @@ -14,7 +17,7 @@ RUN ssh-keygen -f /etc/ssh/ssh_host_ed25519_key -N '' -t ed25519 RUN yum groupinstall -y 'Development Tools' # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/debian-bookworm/Dockerfile b/docker/debian-bookworm/Dockerfile index 1ed48e2..1955599 100644 --- a/docker/debian-bookworm/Dockerfile +++ b/docker/debian-bookworm/Dockerfile @@ -2,14 +2,14 @@ FROM debian:bookworm MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN apt-get update RUN apt-get -y upgrade RUN apt-get install -y wget curl apt-utils git openssh-server libcairo2-dev mercurial build-essential lsb-release RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/debian-bookworm/create_package_deb.sh b/docker/debian-bookworm/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/debian-bookworm/create_package_deb.sh +++ b/docker/debian-bookworm/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/debian-bookworm/pack.sh b/docker/debian-bookworm/pack.sh index 529e8af..6674e3c 100755 --- a/docker/debian-bookworm/pack.sh +++ b/docker/debian-bookworm/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/debian-bullseye/Dockerfile b/docker/debian-bullseye/Dockerfile index 9afdde7..ce20403 100644 --- a/docker/debian-bullseye/Dockerfile +++ b/docker/debian-bullseye/Dockerfile @@ -2,14 +2,14 @@ FROM debian:bullseye MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN apt-get update RUN apt-get -y upgrade RUN apt-get install -y wget curl apt-utils git openssh-server libcairo2-dev mercurial build-essential lsb-release RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/debian-bullseye/create_package_deb.sh b/docker/debian-bullseye/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/debian-bullseye/create_package_deb.sh +++ b/docker/debian-bullseye/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/debian-bullseye/pack.sh b/docker/debian-bullseye/pack.sh index 529e8af..6674e3c 100755 --- a/docker/debian-bullseye/pack.sh +++ b/docker/debian-bullseye/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/debian-buster/Dockerfile b/docker/debian-buster/Dockerfile index 1a0defe..8663a15 100644 --- a/docker/debian-buster/Dockerfile +++ b/docker/debian-buster/Dockerfile @@ -2,7 +2,7 @@ FROM debian:buster MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN apt-get update RUN apt-get install -y --allow-unauthenticated debian-archive-keyring RUN apt-get update @@ -11,7 +11,7 @@ RUN apt-get install -y wget curl apt-utils git openssh-server libcairo2-dev merc RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/debian-buster/create_package_deb.sh b/docker/debian-buster/create_package_deb.sh index 2c558a9..8b5c6ef 100755 --- a/docker/debian-buster/create_package_deb.sh +++ b/docker/debian-buster/create_package_deb.sh @@ -10,7 +10,7 @@ die() { } pwd -git config --global --add safe.directory /root/go/src/github.com/go-graphite/carbonapi +git config --global --add safe.directory /root/go/src/github.com/go-graphite/carbonapi ||: VERSION="" RELEASE="" @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/debian-buster/pack.sh b/docker/debian-buster/pack.sh index 529e8af..6674e3c 100755 --- a/docker/debian-buster/pack.sh +++ b/docker/debian-buster/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/debian-trixie/Dockerfile b/docker/debian-trixie/Dockerfile index ac7a66e..15a96fe 100644 --- a/docker/debian-trixie/Dockerfile +++ b/docker/debian-trixie/Dockerfile @@ -2,14 +2,14 @@ FROM debian:trixie MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN apt-get update RUN apt-get -y upgrade RUN apt-get install -y wget curl apt-utils git openssh-server libcairo2-dev mercurial build-essential lsb-release RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/debian-trixie/create_package_deb.sh b/docker/debian-trixie/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/debian-trixie/create_package_deb.sh +++ b/docker/debian-trixie/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/debian-trixie/pack.sh b/docker/debian-trixie/pack.sh index 529e8af..6674e3c 100755 --- a/docker/debian-trixie/pack.sh +++ b/docker/debian-trixie/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/rebuild.sh b/docker/rebuild.sh index 5734766..5ba1c2e 100755 --- a/docker/rebuild.sh +++ b/docker/rebuild.sh @@ -1,6 +1,6 @@ #!/bin/bash set -e -OS="ubuntu:18.04 ubuntu:20.04 ubuntu:22.04 debian:buster debian:bullseye debian:bookworm rockylinux:8 rockylinux:9 centos:7" +OS="ubuntu:18.04 ubuntu:20.04 ubuntu:22.04 ubuntu:24.04 debian:buster debian:bullseye debian:bookworm rockylinux:8 rockylinux:9 centos:7" SQUASH=false for i in ${OS}; do folder=$(sed 's/:/-/g;s/\.//g' <<< ${i}) diff --git a/docker/rockylinux-8/Dockerfile b/docker/rockylinux-8/Dockerfile index 6d3600c..1379216 100644 --- a/docker/rockylinux-8/Dockerfile +++ b/docker/rockylinux-8/Dockerfile @@ -2,7 +2,7 @@ FROM rockylinux:8 MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN yum upgrade -y RUN yum install -y openssh-server RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa @@ -14,7 +14,7 @@ RUN yum install -y git openssh cairo-devel mercurial ruby-devel wget redhat-lsb- RUN yum groupinstall -y 'Development Tools' # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/rockylinux-8/create_package_rpm.sh b/docker/rockylinux-8/create_package_rpm.sh index ff0a5c1..1371e27 100755 --- a/docker/rockylinux-8/create_package_rpm.sh +++ b/docker/rockylinux-8/create_package_rpm.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|*-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/rockylinux-8/pack.sh b/docker/rockylinux-8/pack.sh index 529e8af..6674e3c 100755 --- a/docker/rockylinux-8/pack.sh +++ b/docker/rockylinux-8/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/rockylinux-9/Dockerfile b/docker/rockylinux-9/Dockerfile index 529dbc7..9c85ffa 100644 --- a/docker/rockylinux-9/Dockerfile +++ b/docker/rockylinux-9/Dockerfile @@ -2,7 +2,7 @@ FROM rockylinux:9 MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN yum upgrade -y RUN yum install -y openssh-server RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa @@ -15,7 +15,7 @@ RUN yum install -y git openssh cairo-devel wget RUN yum groupinstall -y 'Development Tools' # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/rockylinux-9/create_package_rpm.sh b/docker/rockylinux-9/create_package_rpm.sh index ff0a5c1..1371e27 100755 --- a/docker/rockylinux-9/create_package_rpm.sh +++ b/docker/rockylinux-9/create_package_rpm.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|*-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/rockylinux-9/pack.sh b/docker/rockylinux-9/pack.sh index 5e36a35..6674e3c 100755 --- a/docker/rockylinux-9/pack.sh +++ b/docker/rockylinux-9/pack.sh @@ -3,25 +3,11 @@ TYPE="${1}" export PATH="/root/go/bin:/usr/local/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${PATH}" export GOPATH="/root/go" [[ -f /etc/extra_opts ]] && . /etc/extra_opts - -DISTRO="" -LSB_R="" -LSB_C="" -VERSION="" - -type lsb_release &>/dev/null -if [[ $? -ne 0 ]]; then - source /etc/os-release - DISTRO="${ID}" - LSB_C="${VERSION_ID}" - LSB_R="${VERSION_ID}" -else - DISTRO=$(lsb_release -s -i | tr '[:upper:]' '[:lower:]') - # Debian uses 'lsb_release -c' as a repo name - # CentOS and Ubuntu uses 'lsb_release -r' - LSB_R=$(lsb_release -s -r) - LSB_C=$(lsb_release -s -c) -fi +DISTRO=$(lsb_release -s -i | tr '[:upper:]' '[:lower:]') +# Debian uses 'lsb_release -c' as a repo name +# CentOS and Ubuntu uses 'lsb_release -r' +LSB_R=$(lsb_release -s -r) +LSB_C=$(lsb_release -s -c) VERSION="" PKG="deb" if [[ "${DISTRO}" == "centos" ]] || [[ "${DISTRO}" == "rocky" ]]; then @@ -43,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/ubuntu-1804/Dockerfile b/docker/ubuntu-1804/Dockerfile index eac603a..6c64e97 100644 --- a/docker/ubuntu-1804/Dockerfile +++ b/docker/ubuntu-1804/Dockerfile @@ -2,14 +2,14 @@ FROM ubuntu:18.04 MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 RUN apt-get update RUN apt-get -y upgrade RUN apt-get install -y git openssh-server libcairo2-dev mercurial build-essential lsb-release curl RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/ubuntu-1804/create_package_deb.sh b/docker/ubuntu-1804/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/ubuntu-1804/create_package_deb.sh +++ b/docker/ubuntu-1804/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/ubuntu-1804/pack.sh b/docker/ubuntu-1804/pack.sh index 529e8af..6674e3c 100755 --- a/docker/ubuntu-1804/pack.sh +++ b/docker/ubuntu-1804/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/ubuntu-2004/Dockerfile b/docker/ubuntu-2004/Dockerfile index 776f469..f845d0e 100644 --- a/docker/ubuntu-2004/Dockerfile +++ b/docker/ubuntu-2004/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get -y upgrade @@ -10,7 +10,7 @@ RUN apt-get install -y git openssh-server libcairo2-dev mercurial build-essentia RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/ubuntu-2004/create_package_deb.sh b/docker/ubuntu-2004/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/ubuntu-2004/create_package_deb.sh +++ b/docker/ubuntu-2004/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/ubuntu-2004/pack.sh b/docker/ubuntu-2004/pack.sh index 529e8af..6674e3c 100755 --- a/docker/ubuntu-2004/pack.sh +++ b/docker/ubuntu-2004/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi diff --git a/docker/ubuntu-2204/Dockerfile b/docker/ubuntu-2204/Dockerfile index 4a8670d..90b97ac 100644 --- a/docker/ubuntu-2204/Dockerfile +++ b/docker/ubuntu-2204/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:22.04 MAINTAINER Vladimir Smirnov # Make sure the package repository is up to date. -ARG CACHE_DATE=20240212 +ARG CACHE_DATE=20241015 ARG DEBIAN_FRONTEND=noninteractive RUN apt-get update RUN apt-get -y upgrade @@ -10,7 +10,7 @@ RUN apt-get install -y git openssh-server libcairo2-dev mercurial build-essentia RUN mkdir -p /var/run/sshd # Install Go and other deps -RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.22.0.linux-amd64.tar.gz +RUN wget -q -O/tmp/go.tar.gz https://go.dev/dl/go1.23.2.linux-amd64.tar.gz RUN tar -xf /tmp/go.tar.gz -C /usr/local/ RUN rm -f /tmp/go.tar.gz RUN mkdir -p /root/go diff --git a/docker/ubuntu-2204/create_package_deb.sh b/docker/ubuntu-2204/create_package_deb.sh index c6e0430..8b5c6ef 100755 --- a/docker/ubuntu-2204/create_package_deb.sh +++ b/docker/ubuntu-2204/create_package_deb.sh @@ -19,7 +19,7 @@ ARCH=$(uname -m) VERSION_GIT=$(git describe --abbrev=6 --always --tags | cut -c 2-) PKG_VERSION="" case ${VERSION_GIT} in - *-alpha*|*-beta*|*-rc*) + *-alpha*|*-beta*|*-rc*|-patch*) VERSION=$(cut -d'-' -f 1 <<< ${VERSION_GIT}) RELEASE=$(cut -d'-' -f 2 <<< ${VERSION_GIT}) RELEASE2=$(cut -d'-' -f 3 <<< ${VERSION_GIT}) diff --git a/docker/ubuntu-2204/pack.sh b/docker/ubuntu-2204/pack.sh index 529e8af..6674e3c 100755 --- a/docker/ubuntu-2204/pack.sh +++ b/docker/ubuntu-2204/pack.sh @@ -29,7 +29,7 @@ pushd ~/go/src/github.com/go-graphite/"${1}/" make clean REPOS="autobuilds" -git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?$' +git describe --abbrev=6 --dirty --always --tags | grep -q '^v[0-9]\+\.[0-9]\+\(\.[0-9]\+\(\-patch[0-9]\+)\?\)\?$' if [[ $? -eq 0 ]]; then REPOS="stable autobuilds" fi