diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9f11b75 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea/ diff --git a/Dockerfile b/Dockerfile index d9c9c5e..c1888b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,23 @@ #moving to ubuntu instead of debian to solve high vulnerabilities -FROM ubuntu:jammy-20240212 +FROM ubuntu:jammy-20230816 RUN apt-get update && \ apt-get install -y curl bash openssl git && \ apt-get clean -# git-lfs v3.4.0 - last available at the 23.10.2023 and it contains bug. Don't update to the version 3.4.0 !!! -# https://codefresh-io.atlassian.net/browse/CR-20633 -# Next preferred version must be >=3.4.1 and should be tested -RUN apt-get install git-lfs=3.0.2-1 && \ - git lfs install - +ARG GIT_LFS_VERSION=3.4.0 +ARG TARGETPLATFORM + +# installing git-lfs +RUN case ${TARGETPLATFORM} in \ + "linux/amd64") OS_ARCH=amd64 ;; \ + "linux/arm64") OS_ARCH=arm64 ;; \ + esac \ + && curl -sL https://github.com/git-lfs/git-lfs/releases/download/v${GIT_LFS_VERSION}/git-lfs-linux-${OS_ARCH}-v${GIT_LFS_VERSION}.tar.gz -o "git-lfs.tar.gz" && \ + tar -xvzf "git-lfs.tar.gz" && \ + chmod +x git-lfs-${GIT_LFS_VERSION}/install.sh && \ + rm git-lfs.tar.gz && \ + git-lfs-${GIT_LFS_VERSION}/install.sh #installing busybox ARG BUSYBOX_VERSION=1.31.0 @@ -21,15 +28,12 @@ RUN curl -sL https://busybox.net/downloads/binaries/${BUSYBOX_VERSION}-defconfig ls /usr/bin/busybox && \ busybox | head -n 1 - -RUN ln -s /bin/busybox /usr/bin/[[ - COPY ./start.sh /run/start.sh RUN chmod +x /run/start.sh # USER nodeuser RUN addgroup --gid 3000 nodegroup \ - && adduser --uid 3000 --home /home/nodeuser --ingroup nodegroup --shell /bin/sh --gecos "" --disabled-password nodeuser + && adduser --uid 3000 --home /home/nodeuser --ingroup nodegroup --shell /bin/sh --gecos "" --disabled-password nodeuser USER nodeuser CMD ["/run/start.sh"] diff --git a/service.yaml b/service.yaml index 155a381..65c948d 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 10.1.27 +version: 10.1.28