feat: improve apisix-base build (#152)

Author: bzp2010

.github/workflows/push-apisix-base-image.yml

@@ -27,20 +27,22 @@ jobs:
         run: |
           echo "##[set-output name=version;]$(echo ${GITHUB_REF#refs/tags/})"
 
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+        
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
       - name: Login to Docker Hub
         if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Build Docker Image
-        if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
-        run: |
-          docker build -t api7/apisix-base:${{ steps.tag_env.outputs.version }} \
-            --build-arg VERSION=${{ steps.tag_env.outputs.version }} -f ./dockerfiles/Dockerfile.apisix-base.apk .
-      
-      - name: Push docker image
+      - name: Build and Push Docker Image
         if: ${{ startsWith(steps.tag_type.outputs.version, 'apisix-base/') }}
         run: |
-          docker push api7/apisix-base:${{ steps.tag_env.outputs.version }}
+          docker buildx build -t api7/apisix-base:${{ steps.tag_env.outputs.version }} --push \
+            --build-arg VERSION=${{ steps.tag_env.outputs.version }} --platform linux/amd64,linux/arm64 \
+            -f ./dockerfiles/Dockerfile.apisix-base.apk .

dockerfiles/Dockerfile.apisix-base.apk

@@ -1,12 +1,13 @@
 ARG IMAGE_BASE="alpine"
-ARG IMAGE_TAG="3.12"
+ARG IMAGE_TAG="3.14"
 
-FROM ${IMAGE_BASE}:${IMAGE_TAG}
+FROM ${IMAGE_BASE}:${IMAGE_TAG} as build
 
-COPY ./utils/build-common.sh /tmp/build-common.sh
-COPY ./utils/install-common.sh /tmp/install-common.sh
-COPY build-apisix-base.sh /tmp/build-apisix-base.sh
-COPY ./utils/determine-dist.sh /tmp/determine-dist.sh
+COPY ./utils/build-common.sh \
+     ./utils/install-common.sh \
+     build-apisix-base.sh \
+     ./utils/determine-dist.sh \
+     /tmp/
 
 
 ARG RESTY_OPENSSL_VERSION="1.1.1g"
@@ -28,36 +29,30 @@ LABEL resty_eval_pre_configure="${RESTY_EVAL_PRE_CONFIGURE}"
 
 ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
 
-RUN apk add --no-cache --virtual .build-deps \
+RUN apk add --no-cache \
         build-base \
         coreutils \
         curl \
+        gd \
         gd-dev \
+        geoip \
         geoip-dev \
+        libxslt \
         libxslt-dev \
         linux-headers \
         make \
         perl-dev \
         readline-dev \
+        zlib \
         zlib-dev \
         unzip \
-    && apk add --no-cache \
-        gd \
-        geoip \
-        libxslt \
-        zlib \
-        bash \
         git \
         sudo \
-        curl \
-        build-base \
+        bash \
         libstdc++
 
 # install latest Rust to build wasmtime
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rust-installer.sh \
-    && chmod +x ./rust-installer.sh \
-    && ./rust-installer.sh -y \
-    && rm rust-installer.sh
+RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
 
 RUN cd /tmp \
     && if [ -n "${RESTY_EVAL_PRE_CONFIGURE}" ]; then eval $(echo ${RESTY_EVAL_PRE_CONFIGURE}); fi \
@@ -98,4 +93,20 @@ RUN cd /tmp \
     && ./install-common.sh install_luarocks \
     && /usr/local/openresty/bin/openresty -V
 
+
+FROM ${IMAGE_BASE}:${IMAGE_TAG} as prod
+
+COPY --from=build /usr/local/openresty /usr/local/openresty
+
+RUN apk add --no-cache \
+        gd \
+        geoip \
+        libxslt \
+        zlib \
+        libstdc++ \
+    && rm /usr/local/openresty/wasmtime-c-api/lib/libwasmtime.a \
+    && rm /usr/local/openresty/wasmtime-c-api/lib/libwasmtime.d
+
+ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/usr/local/openresty/bin
+
 CMD /bin/sh