From 8e50c68a876690ff093123b1a4c889e143ce41e0 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:00:46 +0530 Subject: [PATCH 01/14] Revert "fix: gorelease issue" This reverts commit 7321d21b03a47c07cb0e720848ebd61c9dc082e4. --- go.mod | 13 ++++++------- go.sum | 27 +++++++++++++-------------- 2 files changed, 19 insertions(+), 21 deletions(-) diff --git a/go.mod b/go.mod index f273efea..be894738 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/vifraa/gopom v0.2.1 github.com/zalando/go-keyring v0.2.5 golang.org/x/oauth2 v0.22.0 - golang.org/x/tools v0.21.0 + golang.org/x/tools v0.19.0 gopkg.in/yaml.v3 v3.0.1 lukechampine.com/blake3 v1.2.1 ) @@ -68,14 +68,13 @@ require ( github.com/xanzy/ssh-agent v0.3.3 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.9.0 // indirect - golang.org/x/crypto v0.23.0 // indirect + golang.org/x/crypto v0.21.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect - golang.org/x/mod v0.17.0 // indirect - golang.org/x/net v0.25.0 // indirect - golang.org/x/sync v0.7.0 // indirect + golang.org/x/mod v0.16.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sys v0.20.0 // indirect - golang.org/x/term v0.20.0 // indirect - golang.org/x/text v0.15.0 // indirect + golang.org/x/term v0.18.0 // indirect + golang.org/x/text v0.14.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 4277f8ac..97191810 100644 --- a/go.sum +++ b/go.sum @@ -163,14 +163,14 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.3.1-0.20221117191849-2c476679df9a/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4= golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU= -golang.org/x/crypto v0.23.0 h1:dIJU/v2J8Mdglj/8rJ6UUOM3Zc9zLZxVZwwxMooUSAI= -golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20230905200255-921286631fa9 h1:GoHiUyI/Tp2nVkLI2mCxVkOjsbSXD66ic0XW0js0R9g= golang.org/x/exp v0.0.0-20230905200255-921286631fa9/go.mod h1:S2oDrQGGwySpoQPVqRShND87VCbxmc6bL1Yd2oYrm6k= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA= -golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic= +golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -178,15 +178,14 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.25.0 h1:d/OCCoBEUq33pjydKrGQhw7IlUPI2Oylr+8qLx49kac= -golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.22.0 h1:BzDx2FehcG7jJwgWLELCdmLuxk2i+x9UDpSiss2u0ZA= golang.org/x/oauth2 v0.22.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -209,8 +208,8 @@ golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuX golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc= golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= -golang.org/x/term v0.20.0 h1:VnkxpohqXaOBYJtBmEppKUG6mXpi+4O6purfc2+sMhw= -golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= @@ -218,14 +217,14 @@ golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= -golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= -golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= -golang.org/x/tools v0.21.0 h1:qc0xYgIbsSDt9EyWz05J5wfa7LOVW0YTLOXrqdLAWIw= -golang.org/x/tools v0.21.0/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw= +golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= From 596764bb4825d41f3f5625189904e438787baf49 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:08:29 +0530 Subject: [PATCH 02/14] Docker code reverted to old --- build/docker/alpine.Dockerfile | 4 ++-- build/docker/debian.Dockerfile | 25 ++++++++++--------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 44b61123..320ae487 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -9,7 +9,7 @@ RUN mkdir -p internal/file/embedded && \ RUN apk add --no-cache make curl && make install && apk del make curl CMD [ "debricked" ] -FROM alpine:3.21 AS cli-base +FROM alpine:latest AS cli-base ENV DEBRICKED_TOKEN="" RUN apk add --no-cache git WORKDIR /root/ @@ -60,7 +60,7 @@ RUN apk --no-cache --update add \ curl \ bash -RUN apk --no-cache --update add dotnet8-sdk go~=1.23 --repository=https://dl-cdn.alpinelinux.org/alpine/v3.21/community +RUN apk --no-cache --update add dotnet8-sdk go~=1.23 --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community RUN dotnet --version && npm -v && yarn -v diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 586bee35..3d28c687 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.4-bookworm AS dev +FROM golang:1.23-bookworm AS dev WORKDIR /cli ARG DEBIAN_FRONTEND=noninteractive @@ -90,23 +90,18 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && rm ./dotnet-install.sh \ && dotnet help -ENV GOLANG_VERSION="1.23.4" -ENV GOPATH="/usr/lib/go" -ENV PATH="$GOPATH/bin:$PATH" +ENV GOLANG_VERSION="1.23" RUN apt -y update && apt -y upgrade && apt -y install \ - ca-certificates \ - wget && \ + ca-certificates && \ apt -y install -t unstable \ - python3.13 \ - python3.13-venv \ + python3.12\ + python3.12-venv \ + golang-$GOLANG_VERSION \ openjdk-21-jdk && \ apt -y clean && rm -rf /var/lib/apt/lists/* && \ - # Install Go manually from official source - wget https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \ - tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz && \ - rm go${GOLANG_VERSION}.linux-amd64.tar.gz && \ - ln -s /usr/local/go/bin/go /usr/bin/go && \ - ln -s /usr/bin/python3.13 /usr/bin/python + # Symlink go binary to bin directory which is in path + ln -s /usr/lib/go-$GOLANG_VERSION/bin/go /usr/bin/go && \ + ln -s /usr/bin/python3.12 /usr/bin/python RUN dotnet --version @@ -137,7 +132,7 @@ RUN apt -y update && apt -y install \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer -RUN ln -sf /usr/bin/python3.13 /usr/bin/python3 && php -v && composer --version && python3 --version +RUN ln -sf /usr/bin/python3.12 /usr/bin/python3 && php -v && composer --version && python3 --version CMD [ "debricked", "scan" ] From 8e79c9864bf8a466c57985bad43633047e808c7d Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:24:33 +0530 Subject: [PATCH 03/14] fix package conflict --- build/docker/alpine.Dockerfile | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 320ae487..59b09d04 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -22,6 +22,11 @@ FROM cli AS scan CMD [ "debricked", "scan" ] FROM cli-base AS resolution + +# Copy Go from the dev stage to avoid Alpine package conflicts with dotnet8-sdk +COPY --from=dev /usr/local/go /usr/local/go +ENV PATH="/usr/local/go/bin:$PATH" + ENV MAVEN_VERSION="3.9.9" ENV MAVEN_HOME="/usr/lib/mvn" ENV PATH="$MAVEN_HOME/bin:$PATH" @@ -52,14 +57,14 @@ RUN apk --no-cache --update add \ openjdk21-jdk \ python3 \ py3-scipy \ - py3-pip \ - nodejs \ - npm \ - yarn \ - g++ \ curl \ bash +RUN apk --no-cache --update add dotnet8-sdk --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community + +RUN dotnet --version && npm -v && yarn -v && go version + bash + RUN apk --no-cache --update add dotnet8-sdk go~=1.23 --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community RUN dotnet --version && npm -v && yarn -v From d4d8f2c3c908f628327af618510e46c567b11f09 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:26:54 +0530 Subject: [PATCH 04/14] fix package conflict --- build/docker/alpine.Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 59b09d04..1cdae474 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -57,17 +57,17 @@ RUN apk --no-cache --update add \ openjdk21-jdk \ python3 \ py3-scipy \ + py3-pip \ + nodejs \ + npm \ + yarn \ + g++ \ curl \ bash RUN apk --no-cache --update add dotnet8-sdk --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community RUN dotnet --version && npm -v && yarn -v && go version - bash - -RUN apk --no-cache --update add dotnet8-sdk go~=1.23 --repository=https://dl-cdn.alpinelinux.org/alpine/v3.20/community - -RUN dotnet --version && npm -v && yarn -v RUN npm install --global bower && bower -v From 774cadf2acacf48569ef9e3bbd91664f0f553ec6 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:34:56 +0530 Subject: [PATCH 05/14] fix package conflict --- build/docker/debian.Dockerfile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 3d28c687..6d7918d1 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -33,6 +33,10 @@ FROM cli-base AS resolution ARG DEBIAN_FRONTEND=noninteractive +# Copy Go from the dev stage to avoid Debian package issues +COPY --from=dev /usr/local/go /usr/local/go +ENV PATH="/usr/local/go/bin:$PATH" + RUN echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list && \ echo "Package: *" >> /etc/apt/preferences && \ echo "Pin: release a=unstable" >> /etc/apt/preferences && \ @@ -90,20 +94,17 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && rm ./dotnet-install.sh \ && dotnet help -ENV GOLANG_VERSION="1.23" RUN apt -y update && apt -y upgrade && apt -y install \ ca-certificates && \ apt -y install -t unstable \ - python3.12\ + python3.12 \ python3.12-venv \ - golang-$GOLANG_VERSION \ openjdk-21-jdk && \ apt -y clean && rm -rf /var/lib/apt/lists/* && \ - # Symlink go binary to bin directory which is in path - ln -s /usr/lib/go-$GOLANG_VERSION/bin/go /usr/bin/go && \ + # Symlink python binary ln -s /usr/bin/python3.12 /usr/bin/python -RUN dotnet --version +RUN dotnet --version && go version RUN apt update -y && \ apt install -t unstable lsb-release apt-transport-https ca-certificates software-properties-common -y && \ From 3872833924808e23337ebce30c7eb7388ebc1dc7 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:39:47 +0530 Subject: [PATCH 06/14] fix package conflict --- build/docker/debian.Dockerfile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 6d7918d1..5f097961 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -95,16 +95,13 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && dotnet help RUN apt -y update && apt -y upgrade && apt -y install \ - ca-certificates && \ - apt -y install -t unstable \ - python3.12 \ - python3.12-venv \ - openjdk-21-jdk && \ - apt -y clean && rm -rf /var/lib/apt/lists/* && \ - # Symlink python binary - ln -s /usr/bin/python3.12 /usr/bin/python - -RUN dotnet --version && go version + ca-certificates \ + python3 \ + python3-venv \ + openjdk-21-jre-headless && \ + apt -y clean && rm -rf /var/lib/apt/lists/* + +RUN dotnet --version && go version && python3 --version RUN apt update -y && \ apt install -t unstable lsb-release apt-transport-https ca-certificates software-properties-common -y && \ From d2562e0d3a942fbd6ea1b3926071fbb0f45d6ec6 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:43:35 +0530 Subject: [PATCH 07/14] fix package conflict --- build/docker/debian.Dockerfile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 5f097961..35a4df68 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -94,14 +94,15 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && rm ./dotnet-install.sh \ && dotnet help -RUN apt -y update && apt -y upgrade && apt -y install \ - ca-certificates \ - python3 \ - python3-venv \ - openjdk-21-jre-headless && \ - apt -y clean && rm -rf /var/lib/apt/lists/* - -RUN dotnet --version && go version && python3 --version +RUN apt -y update && apt -y upgrade && apt -y install ca-certificates && \ + apt -y install -t unstable \ + python3.12 \ + python3.12-venv \ + openjdk-21-jdk && \ + apt -y clean && rm -rf /var/lib/apt/lists/* && \ + ln -s /usr/bin/python3.12 /usr/bin/python + +RUN dotnet --version && go version RUN apt update -y && \ apt install -t unstable lsb-release apt-transport-https ca-certificates software-properties-common -y && \ From b3442052d5346fa97b44ca0895f98ce429e90c78 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:48:50 +0530 Subject: [PATCH 08/14] fix package conflict --- build/docker/debian.Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 35a4df68..6b199e32 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -40,7 +40,8 @@ ENV PATH="/usr/local/go/bin:$PATH" RUN echo "deb http://deb.debian.org/debian unstable main" >> /etc/apt/sources.list && \ echo "Package: *" >> /etc/apt/preferences && \ echo "Pin: release a=unstable" >> /etc/apt/preferences && \ - echo "Pin-Priority: -2" >> /etc/apt/preferences + echo "Pin-Priority: -2" >> /etc/apt/preferences && \ + apt -y update # Uncomment below if testing packages are needed #RUN echo "deb http://deb.debian.org/debian testing-updates main" >> /etc/apt/sources.list && \ @@ -94,7 +95,7 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && rm ./dotnet-install.sh \ && dotnet help -RUN apt -y update && apt -y upgrade && apt -y install ca-certificates && \ +RUN apt -y upgrade && apt -y install ca-certificates && \ apt -y install -t unstable \ python3.12 \ python3.12-venv \ From 47c158dea704a87101fa929723900425d107ea2f Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:54:25 +0530 Subject: [PATCH 09/14] fix package conflict --- build/docker/debian.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 6b199e32..56a9d829 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -97,11 +97,11 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ RUN apt -y upgrade && apt -y install ca-certificates && \ apt -y install -t unstable \ - python3.12 \ - python3.12-venv \ + python3.13 \ + python3.13-venv \ openjdk-21-jdk && \ apt -y clean && rm -rf /var/lib/apt/lists/* && \ - ln -s /usr/bin/python3.12 /usr/bin/python + ln -s /usr/bin/python3.13 /usr/bin/python RUN dotnet --version && go version @@ -132,7 +132,7 @@ RUN apt -y update && apt -y install \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer -RUN ln -sf /usr/bin/python3.12 /usr/bin/python3 && php -v && composer --version && python3 --version +RUN ln -sf /usr/bin/python3.13 /usr/bin/python3 && php -v && composer --version && python3 --version CMD [ "debricked", "scan" ] From 1291ebb0912f3ea0962f1dec065e0f5fff66cf28 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 10:59:20 +0530 Subject: [PATCH 10/14] fix package conflict --- build/docker/debian.Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 56a9d829..3eb8caeb 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -95,7 +95,7 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ && rm ./dotnet-install.sh \ && dotnet help -RUN apt -y upgrade && apt -y install ca-certificates && \ +RUN apt -y update && apt -y upgrade && apt -y install ca-certificates && \ apt -y install -t unstable \ python3.13 \ python3.13-venv \ From 3955d70ef0a537572949775bcd1c7f48f61ea672 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 11:05:56 +0530 Subject: [PATCH 11/14] fix package conflict --- build/docker/debian.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index 3eb8caeb..a8d07277 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -97,11 +97,11 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ RUN apt -y update && apt -y upgrade && apt -y install ca-certificates && \ apt -y install -t unstable \ - python3.13 \ - python3.13-venv \ + python3.12 \ + python3.12-venv \ openjdk-21-jdk && \ apt -y clean && rm -rf /var/lib/apt/lists/* && \ - ln -s /usr/bin/python3.13 /usr/bin/python + ln -s /usr/bin/python3.12 /usr/bin/python RUN dotnet --version && go version @@ -132,7 +132,7 @@ RUN apt -y update && apt -y install \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer -RUN ln -sf /usr/bin/python3.13 /usr/bin/python3 && php -v && composer --version && python3 --version +RUN ln -sf /usr/bin/python3.12 /usr/bin/python3 && php -v && composer --version && python3 --version CMD [ "debricked", "scan" ] From 806cbf457bb1d1ec55da8ed1bef630c998f457c9 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 11:17:47 +0530 Subject: [PATCH 12/14] fix package conflict --- build/docker/debian.Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/docker/debian.Dockerfile b/build/docker/debian.Dockerfile index a8d07277..3eb8caeb 100644 --- a/build/docker/debian.Dockerfile +++ b/build/docker/debian.Dockerfile @@ -97,11 +97,11 @@ RUN curl -fsSLO https://dot.net/v1/dotnet-install.sh \ RUN apt -y update && apt -y upgrade && apt -y install ca-certificates && \ apt -y install -t unstable \ - python3.12 \ - python3.12-venv \ + python3.13 \ + python3.13-venv \ openjdk-21-jdk && \ apt -y clean && rm -rf /var/lib/apt/lists/* && \ - ln -s /usr/bin/python3.12 /usr/bin/python + ln -s /usr/bin/python3.13 /usr/bin/python RUN dotnet --version && go version @@ -132,7 +132,7 @@ RUN apt -y update && apt -y install \ RUN curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer -RUN ln -sf /usr/bin/python3.12 /usr/bin/python3 && php -v && composer --version && python3 --version +RUN ln -sf /usr/bin/python3.13 /usr/bin/python3 && php -v && composer --version && python3 --version CMD [ "debricked", "scan" ] From e42dac56fe12fbd7b84ac99790bec0e98a218135 Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 11:28:21 +0530 Subject: [PATCH 13/14] fix package conflict --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0d8932fc..998421de 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: name: CLI strategy: matrix: - os: [ 'ubuntu-latest', 'windows-latest', 'macos-13' ] + os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ] runs-on: ${{ matrix.os }} steps: - name: Set git to use LF From c9c5d0bfb8aa41544ad1a8c0707fa65a855fc84e Mon Sep 17 00:00:00 2001 From: Chetan_konaganahalli Date: Thu, 18 Dec 2025 11:32:12 +0530 Subject: [PATCH 14/14] fix package conflict --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 998421de..0d8932fc 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -11,7 +11,7 @@ jobs: name: CLI strategy: matrix: - os: [ 'ubuntu-latest', 'windows-latest', 'macos-latest' ] + os: [ 'ubuntu-latest', 'windows-latest', 'macos-13' ] runs-on: ${{ matrix.os }} steps: - name: Set git to use LF