Skip to content

Commit

Permalink
feat: improve Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
juzhiyuan committed Nov 2, 2020
1 parent ea75bf7 commit c68a4c4
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ FROM alpine:latest as pre-build
ARG APISIX_DASHBOARD_VERSION=v2.0

RUN set -x \
&& wget https://github.com/apache/apisix-dashboard/archive/${APISIX_DASHBOARD_VERSION}.tar.gz -O /tmp/apisix-dashboard.tar.gz \
&& wget https://github.com/apache/apisix-dashboard/archive/${APISIX_DASHBOARD_VERSION}.tar.gz -P /tmp \
&& mkdir /usr/local/apisix-dashboard \
&& tar -xvf /tmp/apisix-dashboard.tar.gz -C /usr/local/apisix-dashboard --strip 1
&& tar -xvf /tmp/${APISIX_DASHBOARD_VERSION}.tar.gz -C /usr/local/apisix-dashboard --strip 1

FROM golang:1.14 as api-builder

Expand All @@ -36,11 +36,10 @@ WORKDIR /usr/local/apisix-dashboard/api
RUN mkdir -p ../output/conf \
&& cp ./conf/*.json ../output/conf

RUN wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz -O /tmp/v1.1.tar.gz \
&& mkdir /tmp/dag-to-lua \
&& tar -xvf /tmp/v1.1.tar.gz -C /tmp/dag-to-lua --strip 1 \
RUN wget https://github.com/api7/dag-to-lua/archive/v1.1.tar.gz -P /tmp \
&& tar -zxvf /tmp/v1.1.tar.gz -C /tmp \
&& mkdir -p ../output/dag-to-lua \
&& mv /tmp/dag-to-lua/lib/* ../output/dag-to-lua/
&& cp -r /tmp/dag-to-lua-1.1/lib/* ../output/dag-to-lua

RUN if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.io,direct ; fi

Expand Down

0 comments on commit c68a4c4

Please sign in to comment.