chore(stacks): upgrade codename to bookworm

Author: duanhongyi

.woodpecker/build.yml

@@ -12,7 +12,7 @@ pipeline:
 - name: publish-linux
   image: bash
   commands:
-  - CODENAME=bullseye ./build.sh all $CI_COMMIT_TAG
+  - CODENAME=bookworm ./build.sh all $CI_COMMIT_TAG
   secrets:
   - oss_endpoint
   - oss_access_key_id

Dockerfile

@@ -57,12 +57,16 @@ RUN install-packages \
 		unzip \
 		xz-utils \
 		zlib1g-dev \
-        python3-pip \
+        python3-venv \
 		libucl-dev \
         default-libmysqlclient-dev; \
-    pip install oss2
-# build upx
-RUN git clone -b v3.96 https://github.com/upx/upx --depth=1; \
-  cd upx; git submodule update --init --recursive; make all UPX_UCLDIR=../ucl-1.03 CXXFLAGS_OPTIMIZE="-no-pie -O2"; cd -; \
-  cp upx/src/upx.out /usr/local/bin/upx; \
-  rm -rf ucl-1.03 ucl-1.03.tar.gz upx;
+	python3 -m venv /usr/local/python
+
+ENV PATH "/usr/local/python/bin:${PATH}"
+
+RUN UPX_VERSION=4.0.2; \
+  OS_ARCH=$(dpkg --print-architecture); \
+  wget https://github.com/upx/upx/releases/download/v${UPX_VERSION}/upx-${UPX_VERSION}-${OS_ARCH}_linux.tar.xz; \
+  tar -Jxvf upx-${UPX_VERSION}-${OS_ARCH}_linux.tar.xz; \
+  cp upx-${UPX_VERSION}-${OS_ARCH}_linux/upx /usr/local/bin; \
+  pip install oss2;

scripts/stack-utils

@@ -5,6 +5,8 @@ shopt -s expand_aliases
 alias gzip="gzip -n -9"
 
 . /etc/os-release
+export GO_VERSION=1.20
+export RUBY_VERSION=3.2
 export STACK_NAME="${STACK_NAME:?name is required}"
 export STACK_VERSION="${STACK_VERSION:?version is required}"
 export OS_NAME="${OS_NAME:-linux}"

stacks/envtpl/build.sh

@@ -6,7 +6,7 @@
 # Implement build function
 function build() {
   generate-stack-path
-  install-stack go 1.19.3 && . init-stack
+  install-stack go "${GO_VERSION}" && . init-stack
 
   curl -sSL "https://github.com/subfuzion/envtpl/archive/refs/tags/v${STACK_VERSION}.tar.gz" | tar -xz \
   && mv envtpl-${STACK_VERSION} $GOPATH/src/envtpl/ \

stacks/erlang/make.sh

@@ -3,11 +3,11 @@ REBAR3_VERSION=$(curl -Ls https://github.com/erlang/rebar3/releases|grep /erlang
 
 set -xe \
 	&& OTP_DOWNLOAD_URL="https://github.com/erlang/otp/archive/OTP-${OTP_VERSION}.tar.gz" \
-	&& runtimeDeps='libodbc1 libsctp1 libwxgtk3.0' \
-	&& buildDeps='unixodbc-dev libsctp-dev libwxgtk-webview3.0-gtk3-dev' \
+	&& runtimeDeps='libodbc1 libsctp1 libwxgtk[0-9.-]{1,} libwxgtk-webview[0-9.-]{1,}' \
+	&& buildDeps='unixodbc-dev libsctp-dev libwxgtk-webview[0-9.-]{1,}-dev' \
 	&& apt-get update \
-	&& apt-get install -y --no-install-recommends $runtimeDeps \
-	&& apt-get install -y --no-install-recommends $buildDeps \
+	&& echo apt-get install -y --no-install-recommends $runtimeDeps \
+	&& echo apt-get install -y --no-install-recommends $buildDeps \
 	&& curl -fSL -o otp-src.tar.gz "$OTP_DOWNLOAD_URL" \
 	&& export ERL_TOP="/usr/src/otp_src_${OTP_VERSION%%@*}" \
 	&& mkdir -vp $ERL_TOP \

stacks/fluentd/make.sh

@@ -1,6 +1,7 @@
-install-stack ruby 3.1.0
+install-stack ruby "${RUBY_VERSION}"
 . /opt/drycc/ruby/profile.d/*.sh
 
+jemalloc_version=$(curl -Ls https://github.com/jemalloc/jemalloc/releases|grep /jemalloc/jemalloc/releases/tag/ | sed -E 's/.*\/jemalloc\/jemalloc\/releases\/tag\/([0-9\.]{1,})".*/\1/g' | head -1)
 
 apt-get update \
  && apt-get install -y --no-install-recommends \
@@ -11,12 +12,12 @@ apt-get update \
     " \
  && apt-get install -y --no-install-recommends $buildDeps \
  && echo 'gem: --no-document' >> /etc/gemrc \
- && gem install oj -v 3.10.18 \
- && gem install json -v 2.4.1 \
- && gem install async-http -v 0.54.0 \
- && gem install fluentd -v 1.14.5 \
- && wget -O /tmp/jemalloc-4.5.0.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/4.5.0/jemalloc-4.5.0.tar.bz2 \
- && cd /tmp && tar -xjf jemalloc-4.5.0.tar.bz2 && cd jemalloc-4.5.0/ \
+ && gem install oj \
+ && gem install json \
+ && gem install async-http \
+ && gem install fluentd -v ${STACK_VERSION} \
+ && wget -O /tmp/jemalloc-${jemalloc_version}.tar.bz2 https://github.com/jemalloc/jemalloc/releases/download/${jemalloc_version}/jemalloc-${jemalloc_version}.tar.bz2 \
+ && cd /tmp && tar -xjf jemalloc-${jemalloc_version}.tar.bz2 && cd jemalloc-${jemalloc_version}/ \
  && ./configure && make \
  && mkdir -p /opt/drycc/fluentd/lib \
  && mv lib/libjemalloc.so.2 /opt/drycc/fluentd/lib \

stacks/kube-state-metrics/build.sh

@@ -7,7 +7,7 @@
 function build() {
   generate-stack-path
   install-packages make
-  install-stack go 1.19.3 && . init-stack
+  install-stack go "${GO_VERSION}" && . init-stack
 
   curl -sSL "https://github.com/kubernetes/kube-state-metrics/archive/refs/tags/v${STACK_VERSION}.tar.gz" | tar -xz \
   && cd kube-state-metrics-${STACK_VERSION} \
@@ -23,4 +23,3 @@ function build() {
 
 # call build stack
 build-stack "${1}"
-

stacks/pack/build.sh

@@ -7,7 +7,7 @@
 function build() {
   generate-stack-path
   install-packages make
-  install-stack go 1.19.3 && . init-stack
+  install-stack go "${GO_VERSION}" && . init-stack
 
   curl -sSL "https://github.com/buildpacks/pack/archive/refs/tags/v${STACK_VERSION}.tar.gz" | tar -xz \
   && cd pack-${STACK_VERSION} \

stacks/php/make.sh

@@ -62,6 +62,7 @@ set -eux; \
 	; \
 	tar -Jxf /usr/src/php.tar.xz -C /usr/src; \
 	mv /usr/src/php-${STACK_VERSION} /usr/src/php; \
+	cp -rf /usr/src/php /opt/drycc/php/src; \
 	cd /usr/src/php; \
 	gnuArch="$(dpkg-architecture --query DEB_BUILD_GNU_TYPE)"; \
 	debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \

stacks/podman/build.sh

@@ -37,7 +37,7 @@ EOF
     go-md2man \
     libapparmor-dev
 
-  install-stack go 1.19.3
+  install-stack go "${GO_VERSION}"
   export GOPATH=/opt/drycc/go
   export PATH=$GOPATH/bin:$PATH