Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

use system luarocks on fedora #37

Merged
merged 1 commit into from
Dec 18, 2021
Merged

use system luarocks on fedora #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions nginx/1.21.4/fedora/35/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ RUN set -eux \
--add-module=/stream-lua-nginx-module-${VER_OPENRESTY_STREAMLUA} \
" \
&& make -j "$(nproc)" deps \
&& make -j "$(nproc)" core \
&& make luarocks
&& make -j "$(nproc)" core

RUN set -eux \
# envsubst
Expand Down Expand Up @@ -296,6 +295,7 @@ ARG PKG_DEPS="\
gcc-c++ \
lua-${VER_LUA} \
lua-devel-${VER_LUA} \
luarocks \
openssl-devel \
pcre-devel \
unzip \
Expand All @@ -310,8 +310,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
COPY --from=builder /var/cache/nginx /var/cache/nginx
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
COPY --from=builder /usr/local/bin/luarocks /usr/local/bin/luarocks
COPY --from=builder /usr/local/etc/luarocks /usr/local/etc/luarocks

SHELL ["/bin/sh", "-o", "pipefail", "-c"]

Expand Down
6 changes: 2 additions & 4 deletions tpl/Dockerfile.fedora
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ RUN set -eux \
--add-module=/stream-lua-nginx-module-${VER_OPENRESTY_STREAMLUA} \
" \
&& make -j "$(nproc)" deps \
&& make -j "$(nproc)" core \
&& make luarocks
&& make -j "$(nproc)" core

RUN set -eux \
# envsubst
Expand Down Expand Up @@ -296,6 +295,7 @@ ARG PKG_DEPS="\
gcc-c++ \
lua-${VER_LUA} \
lua-devel-${VER_LUA} \
luarocks \
openssl-devel \
pcre-devel \
unzip \
Expand All @@ -310,8 +310,6 @@ COPY --from=builder /usr/sbin/nginx /usr/sbin/nginx
COPY --from=builder /usr/sbin/nginx-debug /usr/sbin/nginx-debug
COPY --from=builder /var/cache/nginx /var/cache/nginx
COPY --from=builder /usr/bin/envsubst /usr/local/bin/envsubst
COPY --from=builder /usr/local/bin/luarocks /usr/local/bin/luarocks
COPY --from=builder /usr/local/etc/luarocks /usr/local/etc/luarocks

SHELL ["/bin/sh", "-o", "pipefail", "-c"]

Expand Down