diff options
| author | Konstantin Pavlov <thresh@nginx.com> | 2021-12-01 18:34:20 +0300 |
|---|---|---|
| committer | Konstantin Pavlov <thresh@nginx.com> | 2021-12-01 18:34:20 +0300 |
| commit | 3e0ece20b5ad106905faffa9a0a3a527c3aba88c (patch) | |
| tree | c373d988998e81b38c98050ab27cc60027e2bb99 /pkg | |
| parent | 9bea8c452ffea1d9ff78a1bc3ce5c4d2f0d6b95f (diff) | |
| download | unit-3e0ece20b5ad106905faffa9a0a3a527c3aba88c.tar.gz unit-3e0ece20b5ad106905faffa9a0a3a527c3aba88c.tar.bz2 | |
Docker: made Dockerfiles architecture agnostic.
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/docker/Makefile | 4 | ||||
| -rw-r--r-- | pkg/docker/template.Dockerfile | 4 |
2 files changed, 6 insertions, 2 deletions
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 diff --git a/pkg/docker/template.Dockerfile b/pkg/docker/template.Dockerfile index 55feecc6..2d964eb6 100644 --- a/pkg/docker/template.Dockerfile +++ b/pkg/docker/template.Dockerfile @@ -48,6 +48,10 @@ COPY --from=BUILDER /usr/lib/unit/ /usr/lib/unit/ COPY --from=BUILDER /requirements.apt /requirements.apt @@COPY@@ RUN set -x \ + && if [ -f "/tmp/libunit.a" ]; then \ + mv /tmp/libunit.a /usr/lib/$(dpkg-architecture -q DEB_HOST_MULTIARCH)/libunit.a; \ + rm -f /tmp/libunit.a; \ + fi \ && mkdir -p /var/lib/unit/ \ && mkdir /docker-entrypoint.d/ \ && addgroup --system unit \ |