You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by GitBox <gi...@apache.org> on 2021/02/02 05:37:04 UTC
[GitHub] [apisix-docker] gxthrj opened a new pull request #125: fix: modify dockerfile when apisix version > 2.2
gxthrj opened a new pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] tokers commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568578119
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
+ && (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ]; then echo 'use shell ';else bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" /usr/bin/apisix ; fi;) \
Review comment:
Or you can use the `file` command to check the file type.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] fukiki commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
fukiki commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568532977
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
`&& mkdir ~/.luarocks \` should also be added before `luarocks config` in this file, otherwise, push ci will be failed.
##########
File path: all-in-one/apisix/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
&& mkdir ~/.luarocks \ should also be added before luarocks config in this file, otherwise, push ci will be failed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] gxthrj commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
gxthrj commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r569043326
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
Done
##########
File path: all-in-one/apisix/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
Done
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] fukiki commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
fukiki commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568533369
##########
File path: all-in-one/apisix/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
&& mkdir ~/.luarocks \ should also be added before luarocks config in this file, otherwise, push ci will be failed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] nic-chen merged pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
nic-chen merged pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] gxthrj commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
gxthrj commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r569152491
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
+ && (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ]; then echo 'use shell ';else bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" /usr/bin/apisix ; fi;) \
Review comment:
OK, I will do it in the next PR
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] nic-chen commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568575736
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
Review comment:
Would it be better to modify regular expressions than if else?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] nic-chen commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
nic-chen commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568575736
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
Review comment:
Would it be better to modify regular expressions than if else?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] tokers commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
tokers commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568578119
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
+ && (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ]; then echo 'use shell ';else bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" /usr/bin/apisix ; fi;) \
Review comment:
Or you can use the `file` command to check the file type.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] nic-chen commented on pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
nic-chen commented on pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#issuecomment-772198145
ping @gxthrj
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] gxthrj commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
gxthrj commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r569152424
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
&& luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \
&& cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \
- && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \
- && sed -i "1s@.*@$bin@" /usr/bin/apisix \
Review comment:
OK, I will do it in the next PR
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [apisix-docker] fukiki commented on a change in pull request #125: fix: modify dockerfile when apisix version > 2.2
Posted by GitBox <gi...@apache.org>.
fukiki commented on a change in pull request #125:
URL: https://github.com/apache/apisix-docker/pull/125#discussion_r568532977
##########
File path: all-in-one/apisix-dashboard/Dockerfile
##########
@@ -23,8 +23,7 @@ RUN set -x \
&& luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \
Review comment:
`&& mkdir ~/.luarocks \` should also be added before `luarocks config` in this file, otherwise, push ci will be failed.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org