Saving new files for 25.8.1.1

Author: github-actions[bot]

repo-integrations/wss-ghe-app/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM mend/base-repo-controller:25.7.1.1
+FROM mend/base-repo-controller:25.8.1.1
 
 ARG USER_NAME=user
 ARG USER_ID=1542

repo-integrations/wss-remediate/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM mend/base-repo-remediate:25.7.1.1
+FROM mend/base-repo-remediate:25.8.1.1
 
 # The containerbase supports custom user but Renovate requires ubuntu
 ARG USER_NAME=ubuntu

repo-integrations/wss-scanner/docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM mend/base-repo-scanner:25.7.1.1
+FROM mend/base-repo-scanner:25.8.1.1
 
 ARG USER_NAME=wss-scanner
 ARG USER_ID=1000
@@ -19,15 +19,15 @@ SHELL ["/bin/bash", "-c"]
 
 # Download the pre-scan builder and set it in $PATH, can be replaced by:
 #--build-arg $PSB_URL=URL
-RUN echo "Downloading PSB version 25.4.1"
-ARG PSB_URL=https://downloads.mend.io/production/sca/pre-scan-builder/25.4.1/linux_amd64/psb
+RUN echo "Downloading PSB version 8.1"
+ARG PSB_URL=https://downloads.mend.io/production/sca/pre-scan-builder/25.8.1/linux_amd64/psb
 RUN curl $PSB_URL --create-dirs -o /psb/bin/psb && chmod 0775 -R /psb
 ENV PATH=$PATH:/psb/bin/
 
 # Download the mend sca tool
 #--build-arg $SCA_TOOL_URL=URL
 USER 0
-ARG SCA_TOOL_URL=https://downloads.mend.io/production/sca/sca-wrapper/25.6.2.1/linux_amd64/sca-wrapper
+ARG SCA_TOOL_URL=https://downloads.mend.io/production/sca/sca-wrapper/25.7.2.1/linux_amd64/sca-wrapper
 RUN echo "Downloading Mend SCA tool [$SCA_TOOL_URL]"
 RUN curl $SCA_TOOL_URL --create-dirs -o /sca-wrapper/bin/sca-wrapper && chmod 0777 -R /sca-wrapper
 ENV MEND_SCA_BIN_DIR=/sca-wrapper/bin
@@ -46,6 +46,8 @@ ENV PATH=$PATH:/sast/bin
 ### copy folder
 COPY docker-image-scanner/ /
 
+# Temporarily copying the current Dockerfile to generate the installed-versions.json file.
+
 RUN chmod 755 /start.sh
 RUN chgrp -R 0 ${USER_HOME} && chmod -R g=u ${USER_HOME}
 

repo-integrations/wss-scanner/docker/Dockerfilefull

@@ -1,4 +1,4 @@
-FROM mend/base-repo-scanner:25.7.1.1-full
+FROM mend/base-repo-scanner:25.8.1.1-full
 
 ARG USER_NAME=wss-scanner
 ARG USER_ID=1000
@@ -17,19 +17,17 @@ SHELL ["/bin/bash", "-c"]
 # RUN ln -s ${USER_HOME}/.local/bin/runinstall ${USER_HOME}/.local/bin/pipenv
 # RUN ln -s ${USER_HOME}/.local/bin/runinstall ${USER_HOME}/.local/bin/poetry
 
-# Download the pre-scan builder and set it in $PATH, can be replaced by:
-#--build-arg $PSB_URL=URL
-RUN echo "Downloading PSB version 25.4.1"
-ARG PSB_URL=https://downloads.mend.io/production/sca/pre-scan-builder/25.4.1/linux_amd64/psb
+RUN echo "Downloading PSB version 25.8.1"
+ARG PSB_URL=https://downloads.mend.io/production/sca/pre-scan-builder/25.8.1/linux_amd64/psb
 RUN curl $PSB_URL --create-dirs -o /psb/bin/psb && chmod 0775 -R /psb
 ENV PATH=$PATH:/psb/bin/
 
 # Download the mend sca tool
 #--build-arg $SCA_TOOL_URL=URL
 USER 0
-ARG SCA_TOOL_URL=https://downloads.mend.io/production/sca/sca-wrapper/25.6.2.1/linux_amd64/sca-wrapper
+ARG SCA_TOOL_URL=https://downloads.mend.io/production/sca/sca-wrapper/25.7.2.1/linux_amd64/sca-wrapper
 RUN echo "Downloading Mend SCA tool [$SCA_TOOL_URL]"
-RUN curl $SCA_TOOL_URL --create-dirs -o /sca-wrapper/bin/sca-wrapper && chmod 0777 -R /sca-wrapper
+RUN curl $SCA_TOOL_URL --create-dirs -o /sca-wrapper/bin/sca-wrapper && chmod 0775 -R /sca-wrapper
 ENV MEND_SCA_BIN_DIR=/sca-wrapper/bin
 ENV PATH=$PATH:$MEND_SCA_BIN_DIR
 ENV MEND_SCA_SCAN_PRINT_ENGINE_LOGS=true
@@ -46,6 +44,8 @@ ENV PATH=$PATH:/sast/bin
 ### copy folder
 COPY docker-image-scanner/ /
 
+# Temporarily copying the current Dockerfile to generate the installed-versions.json file.
+
 RUN chmod 755 /start.sh
 RUN chgrp -R 0 ${USER_HOME} && chmod -R g=u ${USER_HOME}
 
@@ -55,7 +55,7 @@ ENV LOG4J_FORMAT_MSG_NO_LOOKUPS=true
 ### Switch User ###
 ENV HOME ${USER_HOME}
 WORKDIR ${USER_HOME}
-USER ${USER_NAME}
+USER ${USER_ID}
 ARG JAVA_OPTS
 ENV JAVA_OPTS=${JAVA_OPTS}
 ENV JDK_JAVA_OPTIONS "--add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/sun.reflect.generics.reflectiveObjects=ALL-UNNAMED"
@@ -64,7 +64,7 @@ EXPOSE 9393
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 # Mend traceability labels
-LABEL io.mend.image.dockerfile.path=integration-new/github-scanner-parent/scm-packaging/src/assembly-staging/docker/Dockerfile
+LABEL io.mend.image.dockerfile.path=integration-new/github-scanner-parent/scm-packaging/src/assembly-staging/docker/Dockerfilefull
 LABEL org.opencontainers.image.source=https://github.com/whitesource/github-scanner
 
 CMD ["/start.sh"]