From 3e0ece20b5ad106905faffa9a0a3a527c3aba88c Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 1 Dec 2021 18:34:20 +0300 Subject: Docker: made Dockerfiles architecture agnostic. --- pkg/docker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/docker/Makefile') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index a2c1a52b..18c406a9 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -23,7 +23,7 @@ CONTAINER_go ?= golang:$(VERSION_go) CONFIGURE_go ?= go --go-path=$$GOPATH INSTALL_go ?= go-install-src libunit-install define COPY_go -COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/\n\$ +COPY --from=BUILDER /usr/lib/\*-linux-gnu/libunit.a /tmp/\n\$ COPY --from=BUILDER /usr/include/nxt_* /usr/include/\n\$ COPY --from=BUILDER /go/src/ /go/src/ endef @@ -39,7 +39,7 @@ CONTAINER_node ?= node:$(VERSION_node) CONFIGURE_node ?= nodejs --node-gyp=/usr/local/lib/node_modules/npm/bin/node-gyp-bin/node-gyp INSTALL_node ?= node node-install libunit-install define COPY_node -COPY --from=BUILDER /usr/lib/x86_64-linux-gnu/libunit.a /usr/lib/x86_64-linux-gnu/\n\$ +COPY --from=BUILDER /usr/lib/\*-linux-gnu/libunit.a /tmp/\n\$ COPY --from=BUILDER /usr/include/nxt_* /usr/include/\n\$ COPY --from=BUILDER /usr/local/lib/node_modules/unit-http/ /usr/local/lib/node_modules/unit-http/ endef -- cgit From 650784928293bb07b5b4acf4b14d3845b011556d Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Fri, 17 Dec 2021 17:15:55 +0300 Subject: Docker: bumped PHP image version. --- pkg/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/docker/Makefile') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 18c406a9..91038b4c 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -50,7 +50,7 @@ CONFIGURE_perl ?= perl INSTALL_perl ?= perl-install COPY_perl = -VERSION_php ?= 8.0 +VERSION_php ?= 8.1 CONTAINER_php ?= php:$(VERSION_php)-cli CONFIGURE_php ?= php INSTALL_php ?= php-install -- cgit From 485886d8f9a665e9c416a98dd00e5c836b6bf27c Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Thu, 13 Jan 2022 11:35:12 +0300 Subject: Docker: bumped Python image version. --- pkg/docker/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/docker/Makefile') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 91038b4c..39261b0a 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -56,7 +56,7 @@ CONFIGURE_php ?= php INSTALL_php ?= php-install COPY_php = RUN ldconfig -VERSION_python ?= 3.9 +VERSION_python ?= 3.10 CONTAINER_python ?= python:$(VERSION_python) CONFIGURE_python ?= python --config=/usr/local/bin/python3-config INSTALL_python ?= python3-install -- cgit From 967fa8f78afd0cd960e0159e61dbbe9ca8eabf91 Mon Sep 17 00:00:00 2001 From: Konstantin Pavlov Date: Wed, 11 May 2022 12:59:39 +0400 Subject: Docker: bumped language versions. --- pkg/docker/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/docker/Makefile') diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index 39261b0a..5c48f925 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -18,7 +18,7 @@ INSTALL_minimal ?= version define COPY_minimal endef -VERSION_go ?= 1.17 +VERSION_go ?= 1.18 CONTAINER_go ?= golang:$(VERSION_go) CONFIGURE_go ?= go --go-path=$$GOPATH INSTALL_go ?= go-install-src libunit-install @@ -62,7 +62,7 @@ CONFIGURE_python ?= python --config=/usr/local/bin/python3-config INSTALL_python ?= python3-install COPY_python = -VERSION_ruby ?= 3.0 +VERSION_ruby ?= 3.1 CONTAINER_ruby ?= ruby:$(VERSION_ruby) CONFIGURE_ruby ?= ruby INSTALL_ruby ?= ruby-install -- cgit