Skip to content

Commit

Permalink
Merge pull request #1527 from tkan145/dependencies-path
Browse files Browse the repository at this point in the history
[build] Correct the dependencies path
  • Loading branch information
tkan145 authored Jan 23, 2025
2 parents 102e02d + b886ca2 commit 11b264a
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ RUN yum localinstall --assumeyes \
/tmp/openresty-zlib/RPMS/`arch`/openresty-zlib-devel-1.2.11-122.el8.`arch`.rpm

COPY dependencies/rpm-specs/openresty/openresty.spec ${RPMBUILD_ROOT}/SPECS/openresty.spec
COPY dependencies/openresty/patches/openresty-1.21.4_01-use-local-dependencies.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/openresty/patches/openresty-1.21.4_02-add-extra-flags.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/openresty/patches/openresty-1.21.4_03-add-TARGET_STRIP-for-luajit.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/openresty/patches/openresty-1.21.4_04-bump-nginx-version.patch ${RPMBUILD_ROOT}/SOURCES
COPY dependencies/rpm-specs/openresty/patches/openresty-1.21.4_01-use-local-dependencies.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/rpm-specs/openresty/patches/openresty-1.21.4_02-add-extra-flags.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/rpm-specs/openresty/patches/openresty-1.21.4_03-add-TARGET_STRIP-for-luajit.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/rpm-specs/openresty/patches/openresty-1.21.4_04-bump-nginx-version.patch ${RPMBUILD_ROOT}/SOURCES

RUN yum-builddep --assumeyes SPECS/openresty.spec

Expand Down Expand Up @@ -122,7 +122,7 @@ RUN rpmbuild -ba SPECS/openresty.spec
FROM rpm-builder as luarocks

COPY dependencies/rpm-specs/luarocks/luarocks.spec ${RPMBUILD_ROOT}/SPECS/luarocks.spec
COPY dependencies/luarocks/luarocks-3.9.1-dynamic_libdir.patch ${RPMBUILD_ROOT}/SOURCES/
COPY dependencies/rpm-specs/luarocks/luarocks-3.9.1-dynamic_libdir.patch ${RPMBUILD_ROOT}/SOURCES/

# install package dependencies
ARG OPENRESTY_RPM_VERSION="1.21.4-1.el8"
Expand Down

0 comments on commit 11b264a

Please sign in to comment.