Merge pull request #228 from keveinliu/upgrade-docker

[chore] update alpine image

Author: keveinliu

Dockerfile

@@ -1,58 +1,56 @@
-FROM alpine:3.16.1 as builder
+FROM alpine:3.22.2 as builder
 LABEL maintainer="Kevein Liu<[email protected]>"
 
 ENV  pkg_prefix              /usr/local
-ENV  pkg_confdir	     /etc/pipy
 ENV  pkg_bindir              ${pkg_prefix}/bin
 ENV  CXX       		     clang++
 ENV  CC			     clang
 
 ARG COMMIT_TAG
-ENV CI_COMMIT_TAG=${COMMIT_TAG}
+ENV CI_COMMIT_TAG ${COMMIT_TAG}
 
 ARG COMMIT_ID
-ENV CI_COMMIT_SHA=${COMMIT_ID}
+ENV CI_COMMIT_SHA ${COMMIT_ID}
 
 ARG COMMIT_DATE
-ENV CI_COMMIT_DATE=${COMMIT_DATE}
+ENV CI_COMMIT_DATE ${COMMIT_DATE}
 
 ARG PIPY_GUI
-ENV PIPY_GUI=${PIPY_GUI:-OFF}
+ENV PIPY_GUI ${PIPY_GUI:-OFF}
 
 ARG PIPY_STATIC
-ENV PIPY_STATIC=${PIPY_STATIC:-OFF}
+ENV PIPY_STATIC ${PIPY_STATIC:-OFF}
 
 ARG BUILD_TYPE
-ENV BUILD_TYPE=${BUILD_TYPE:-Release}
+ENV BUILD_TYPE ${BUILD_TYPE:-Release}
 
 COPY . /pipy
 
 RUN apk add --no-cache --virtual .build-deps openssh-client cmake clang \
     alpine-sdk linux-headers autoconf automake libtool tiff jpeg zlib \
-    zlib-dev pkgconf nasm file musl-dev
+    zlib-dev pkgconf nasm file musl-dev lscpu
 
-RUN if [ "$PIPY_GUI" == "ON" ] ; then apk add --no-cache nodejs npm && cd pipy && npm install && npm run build; fi
+RUN if [ "$PIPY_GUI" == "ON" ] ; then apk add --no-cache nodejs npm && cd pipy && npm install && npm run build && rm -fr src/scripts/repo/html && mv public src/scripts/repo/html; fi
 
 RUN rm -fr pipy/build \
     && mkdir pipy/build \
     && cd pipy/build \
     && export CI_COMMIT_SHA \
     && export CI_COMMIT_TAG \
     && export CI_COMMIT_DATE \
-    && cmake -DPIPY_GUI=${PIPY_GUI} -DPIPY_STATIC=${PIPY_STATIC} -DPIPY_CODEBASES=${PIPY_GUI} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. \
+    && cmake -DPIPY_GUI=${PIPY_GUI} -DPIPY_STATIC=${PIPY_STATIC} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} .. \
     && make -j$(getconf _NPROCESSORS_ONLN) \
-    && mkdir ${pkg_confdir} \
     && cp /pipy/bin/pipy ${pkg_bindir} \
     && apk del .build-deps
 
 
-FROM alpine:3.16.1 as prod
+FROM alpine:3.22.2 as prod
 COPY --from=builder /pipy/bin/pipy /usr/local/bin/pipy
 COPY tools/sidecar/* /usr/local/bin/
 RUN apk add --no-cache ca-certificates libstdc++ libcap su-exec tar curl busybox-extras iptables tzdata socat logrotate 
 RUN adduser -Su 1340 pipy \
     && chmod -R g=u /usr/local/bin/pipy \
-    && chown -R pipy:0 /usr/local/bin/pipy /etc/pipy 
+    && chown -R pipy:0 /usr/local/bin/pipy
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 

Dockerfile-loongnix

@@ -31,7 +31,7 @@ COPY . /pipy
 
 RUN yum install -y --quiet openssh-clients cmake clang autoconf automake zlib zlib-devel pkgconf file nodejs npm make
 
-RUN if [ "$PIPY_GUI" == "ON" ] ; then cd pipy && npm install && npm run build; fi
+RUN if [ "$PIPY_GUI" == "ON" ] ; then cd pipy && npm install && npm run build && rm -fr src/scripts/repo/html && mv public src/scripts/repo/html; fi
 
 RUN rm -fr pipy/build \
         && mkdir pipy/build \
@@ -43,7 +43,7 @@ RUN rm -fr pipy/build \
         && export CI_COMMIT_SHA \
         && export CI_COMMIT_TAG=${VERSION}-${REVISION} \
         && export CI_COMMIT_DATE \
-        && cmake -DPIPY_GUI=${PIPY_GUI} -DPIPY_STATIC=${PIPY_STATIC} -DPIPY_SAMPLES=${PIPY_GUI} -DCMAKE_BUILD_TYPE=Release .. \
+        && cmake -DPIPY_GUI=${PIPY_GUI} -DPIPY_STATIC=${PIPY_STATIC} -DCMAKE_BUILD_TYPE=Release .. \
         && make -j$(getconf _NPROCESSORS_ONLN) \
         && mkdir ${pkg_confdir} \
         && cp /pipy/bin/pipy ${pkg_bindir}
@@ -55,7 +55,7 @@ COPY tools/* /usr/local/bin/
 RUN yum install -y --quiet ca-certificates libstdc++ libcap tar curl iptables tzdata socat logrotate 
 RUN useradd -ru 1340 pipy \
     && chmod -R g=u /usr/local/bin/pipy \
-    && chown -R pipy:0 /usr/local/bin/pipy /etc/pipy 
+    && chown -R pipy:0 /usr/local/bin/pipy
 
 COPY docker-entrypoint.sh /docker-entrypoint.sh
 

build.sh

@@ -192,7 +192,7 @@ function build() {
   if [ $PIPY_GUI == "ON" ] ; then
     npm install
     npm run build
-	  mv public src/scripts/repo/html
+    mv public src/scripts/repo/html
   fi
   mkdir ${PIPY_DIR}/build 2>&1 > /dev/null || true
   rm -fr ${PIPY_DIR}/build/*