yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: ensure PROFILE=emqx when running make emqx-elixir

This commit is contained in:
Shawn 2022-08-14 17:57:11 +08:00
parent 59dfde04a9
commit cd0114b3dc
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deploy/docker/Dockerfile
View File

@ -7,14 +7,15 @@ COPY . /emqx
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx
ENV EMQX_RELUP=false ENV EMQX_RELUP=false
RUN export PROFILE="$EMQX_NAME" \ RUN export PROFILE=${EMQX_NAME%%-elixir} \
&& export EMQX_NAME=${EMQX_NAME%%-elixir} \ && export EMQX_NAME1=$EMQX_NAME \
&& export EMQX_NAME=$PROFILE \
&& export EMQX_LIB_PATH="_build/$EMQX_NAME/lib" \ && export EMQX_LIB_PATH="_build/$EMQX_NAME/lib" \
&& export EMQX_REL_PATH="/emqx/_build/$EMQX_NAME/rel/emqx" \ && export EMQX_REL_PATH="/emqx/_build/$EMQX_NAME/rel/emqx" \
&& export EMQX_REL_FORM='docker' \ && export EMQX_REL_FORM='docker' \
&& cd /emqx \ && cd /emqx \
&& rm -rf $EMQX_LIB_PATH \ && rm -rf $EMQX_LIB_PATH \
&& make $PROFILE \ && make $EMQX_NAME1 \
&& mkdir -p /emqx-rel \ && mkdir -p /emqx-rel \
&& mv $EMQX_REL_PATH /emqx-rel && mv $EMQX_REL_PATH /emqx-rel

7
deploy/docker/Dockerfile.alpine
View File

@ -28,14 +28,15 @@ COPY . /emqx
ARG EMQX_NAME=emqx ARG EMQX_NAME=emqx
ENV EMQX_RELUP=false ENV EMQX_RELUP=false
RUN export PROFILE="$EMQX_NAME" \ RUN export PROFILE=${EMQX_NAME%%-elixir} \
&& export EMQX_NAME=${EMQX_NAME%%-elixir} \ && export EMQX_NAME1=$EMQX_NAME \
&& export EMQX_NAME=$PROFILE \
&& export EMQX_LIB_PATH="_build/$EMQX_NAME/lib" \ && export EMQX_LIB_PATH="_build/$EMQX_NAME/lib" \
&& export EMQX_REL_PATH="/emqx/_build/$EMQX_NAME/rel/emqx" \ && export EMQX_REL_PATH="/emqx/_build/$EMQX_NAME/rel/emqx" \
&& export EMQX_REL_FORM='docker' \ && export EMQX_REL_FORM='docker' \
&& cd /emqx \ && cd /emqx \
&& rm -rf $EMQX_LIB_PATH \ && rm -rf $EMQX_LIB_PATH \
&& make $PROFILE \ && make $EMQX_NAME1 \
&& mkdir -p /emqx-rel \ && mkdir -p /emqx-rel \
&& mv $EMQX_REL_PATH /emqx-rel && mv $EMQX_REL_PATH /emqx-rel