From 94cb2ec3bf98c8cd907a05680d3740d68724dee9 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 24 Mar 2025 16:27:58 +0300 Subject: [PATCH] make - autocommit --- linux/advanced/teamcity/server/2025.03/Dockerfile | 12 +++++++++--- linux/advanced/teamcity/server/latest/Dockerfile | 10 ++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/linux/advanced/teamcity/server/2025.03/Dockerfile b/linux/advanced/teamcity/server/2025.03/Dockerfile index 0353d3eaf..5fec25c77 100644 --- a/linux/advanced/teamcity/server/2025.03/Dockerfile +++ b/linux/advanced/teamcity/server/2025.03/Dockerfile @@ -1,4 +1,4 @@ -FROM jetbrains/teamcity-server:2025.03 +FROM jetbrains/teamcity-server:latest LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" LABEL org.opencontainers.image.vendor="EpicMorg DevTeam, developer@epicm.org" LABEL org.opencontainers.image.authors="STAM, kasthack, Aleks-Z" @@ -210,8 +210,14 @@ ENV PATH="${P4_BIN_DIR}:${PATH}" # Update internal p4 binary to new RUN rm -rfv /opt/perforce/bin/p4 && \ - ln -sfv ${P4_BIN_DIR}/p4 /opt/perforce/bin/p4 && \ - ln -sfv ${P4_BIN_DIR}/p4 /opt/perforce/usr/bin/p4 + rm -rfv /bin/p4 && \ + rm -rfv /sbin/p4 && \ + rm -rfv /usr/bin/p4 && \ + rm -rfv /usr/sbin/p4 && \ + rm -rfv /usr/local/bin/p4 && \ + rm -rfv /usr/local/sbin/p4 + +ENV PATH="${P4_BIN_DIR}:${PATH}" ################################################################## # Install 7z official binary diff --git a/linux/advanced/teamcity/server/latest/Dockerfile b/linux/advanced/teamcity/server/latest/Dockerfile index aab6c467f..5fec25c77 100644 --- a/linux/advanced/teamcity/server/latest/Dockerfile +++ b/linux/advanced/teamcity/server/latest/Dockerfile @@ -210,8 +210,14 @@ ENV PATH="${P4_BIN_DIR}:${PATH}" # Update internal p4 binary to new RUN rm -rfv /opt/perforce/bin/p4 && \ - ln -sfv ${P4_BIN_DIR}/p4 /opt/perforce/bin/p4 && \ - ln -sfv ${P4_BIN_DIR}/p4 /opt/perforce/usr/bin/p4 + rm -rfv /bin/p4 && \ + rm -rfv /sbin/p4 && \ + rm -rfv /usr/bin/p4 && \ + rm -rfv /usr/sbin/p4 && \ + rm -rfv /usr/local/bin/p4 && \ + rm -rfv /usr/local/sbin/p4 + +ENV PATH="${P4_BIN_DIR}:${PATH}" ################################################################## # Install 7z official binary