diff options
| author | Max Romanov <max.romanov@nginx.com> | 2019-12-24 17:59:44 +0300 |
|---|---|---|
| committer | Max Romanov <max.romanov@nginx.com> | 2019-12-24 17:59:44 +0300 |
| commit | 3d712a7078e6cd85dc7f2961628bea46cfea5236 (patch) | |
| tree | 10ffa05fdcab63d05e3b1b7ba1c8cb6ddcafea7a /pkg/docker | |
| parent | 823f658c771af8b6ff07a3581a2c63efc6a15ad2 (diff) | |
| download | unit-3d712a7078e6cd85dc7f2961628bea46cfea5236.tar.gz unit-3d712a7078e6cd85dc7f2961628bea46cfea5236.tar.bz2 | |
Packages: making unit-go architecture independent.
To support Go modules, the unit-go module should be platform independent.
All platform-dependent logic is moved to libunit, so the unit-dev package
should be installed before building unit-go.
Diffstat (limited to '')
| -rw-r--r-- | pkg/docker/Dockerfile.go1.11-dev | 2 | ||||
| -rw-r--r-- | pkg/docker/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/docker/Dockerfile.go1.11-dev b/pkg/docker/Dockerfile.go1.11-dev index b0388346..adcea336 100644 --- a/pkg/docker/Dockerfile.go1.11-dev +++ b/pkg/docker/Dockerfile.go1.11-dev @@ -22,7 +22,7 @@ RUN set -x \ test -z "$found" && echo >&2 "error: failed to fetch GPG key $NGINX_GPGKEY" && exit 1; \ apt-get remove --purge --auto-remove -y gnupg1 && rm -rf /var/lib/apt/lists/* \ && dpkgArch="$(dpkg --print-architecture)" \ - && unitPackages="unit=${UNIT_VERSION} unit-go1.11=${UNIT_VERSION} gcc" \ + && unitPackages="unit=${UNIT_VERSION} unit-go=${UNIT_VERSION} gcc" \ && case "$dpkgArch" in \ amd64|i386) \ # arches officialy built by upstream diff --git a/pkg/docker/Makefile b/pkg/docker/Makefile index d2c23529..d80b8763 100644 --- a/pkg/docker/Makefile +++ b/pkg/docker/Makefile @@ -19,7 +19,7 @@ MODULE_python2.7="unit=$${UNIT_VERSION} unit-python2.7=$${UNIT_VERSION}" MODULE_python3.7="unit=$${UNIT_VERSION} unit-python3.7=$${UNIT_VERSION}" -MODULE_go1.11-dev="unit=$${UNIT_VERSION} unit-go1.11=$${UNIT_VERSION} gcc" +MODULE_go1.11-dev="unit=$${UNIT_VERSION} unit-go=$${UNIT_VERSION} gcc" MODULE_perl5.28="unit=$${UNIT_VERSION} unit-perl=$${UNIT_VERSION}" |