diff options
Diffstat (limited to 'pkg/docker/Makefile')
| -rw-r--r-- | pkg/docker/Makefile | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 48dc5a04..23401e7e 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -52,7 +52,7 @@ INSTALL_perl ?= perl-install RUN_perl ?= /bin/true MODULE_PREBUILD_perl ?= /bin/true -VERSIONS_php ?= 8.2 8.3 +VERSIONS_php ?= 8.3 8.4 VARIANT_php ?= cli-$(VARIANT) $(foreach phpversion, $(VERSIONS_php), $(eval CONTAINER_php$(phpversion) = php:$(phpversion)-$(VARIANT_php))) CONFIGURE_php ?= php @@ -60,7 +60,7 @@ INSTALL_php ?= php-install RUN_php ?= ldconfig MODULE_PREBUILD_php ?= /bin/true -VERSIONS_python ?= 3.11 3.12 +VERSIONS_python ?= 3.12 3.13 VARIANT_python ?= $(VARIANT) $(foreach pythonversion, $(VERSIONS_python), $(eval CONTAINER_python$(pythonversion) = python:$(pythonversion)-$(VARIANT_python))) $(foreach pythonversion, $(VERSIONS_python), $(eval CONTAINER_python$(pythonversion)-slim = python:$(pythonversion)-slim-$(VARIANT_python))) @@ -84,27 +84,7 @@ INSTALL_wasm ?= wasm-install wasm-wasi-component-install RUN_wasm ?= /bin/true define MODULE_PREBUILD_wasm -apt-get install --no-install-recommends --no-install-suggests -y libclang-dev cmake \\\n \ -\ \ \ \&\& export RUST_VERSION=1.80.1 \\\n \ -\ \ \ \&\& export RUSTUP_HOME=/usr/src/unit/rustup \\\n \ -\ \ \ \&\& export CARGO_HOME=/usr/src/unit/cargo \\\n \ -\ \ \ \&\& export PATH=/usr/src/unit/cargo/bin:\$$PATH \\\n \ -\ \ \ \&\& dpkgArch="\$$\(dpkg --print-architecture\)" \\\n \ -\ \ \ \&\& case "\$${dpkgArch##*-}" in \\\n \ -\ \ \ \ \ \ amd64\) rustArch="x86_64-unknown-linux-gnu"; rustupSha256="6aeece6993e902708983b209d04c0d1dbb14ebb405ddb87def578d41f920f56d" ;; \\\n \ -\ \ \ \ \ \ arm64\) rustArch="aarch64-unknown-linux-gnu"; rustupSha256="1cffbf51e63e634c746f741de50649bbbcbd9dbe1de363c9ecef64e278dba2b2" ;; \\\n \ -\ \ \ \ \ \ *\) echo \>\&2 "unsupported architecture: \$${dpkgArch}"; exit 1 ;; \\\n \ -\ \ \ \esac \\\n \ -\ \ \ \&\& url="https://static.rust-lang.org/rustup/archive/1.27.1/\$${rustArch}/rustup-init" \\\n \ -\ \ \ \&\& curl -L -O "\$$url" \\\n \ -\ \ \ \&\& echo "\$${rustupSha256} *rustup-init" | sha256sum -c - \\\n \ -\ \ \ \&\& chmod +x rustup-init \\\n \ -\ \ \ \&\& ./rustup-init -y --no-modify-path --profile minimal --default-toolchain \$$RUST_VERSION --default-host \$${rustArch} \\\n \ -\ \ \ \&\& rm rustup-init \\\n \ -\ \ \ \&\& rustup --version \\\n \ -\ \ \ \&\& cargo --version \\\n \ -\ \ \ \&\& rustc --version \\\n \ -\ \ \ \&\& make -C pkg/contrib .wasmtime \\\n \ +make -C pkg/contrib .wasmtime \\\n \ \ \ \ \&\& install -pm 755 pkg/contrib/wasmtime/artifacts/lib/libwasmtime.so /usr/lib/\$$\(dpkg-architecture -q DEB_HOST_MULTIARCH\)/ endef |