diff --git a/Dockerfile b/Dockerfile index 3621bc3..cf9c264 100755 --- a/Dockerfile +++ b/Dockerfile @@ -3,6 +3,8 @@ FROM golang:alpine AS deps WORKDIR /app COPY go.mod go.sum ./ RUN sed -i '/replace/d' go.mod +RUN apk add --no-cache git +RUN git config --global url."https://cloud.o-forge.io/".insteadOf "http://cloud.o-forge.io/" RUN go mod download #---------------------------------------------------------------------------------------------- diff --git a/go.mod b/go.mod index 961180f..92962a4 100755 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module oc-catalog go 1.25.0 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20260527135023-cef23b5f307b + cloud.o-forge.io/core/oc-lib v0.0.0-20260529071252-7e5b69b1d2db github.com/beego/beego/v2 v2.3.8 github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 github.com/smartystreets/goconvey v1.7.2 diff --git a/go.sum b/go.sum index 73efc0d..c2923ec 100755 --- a/go.sum +++ b/go.sum @@ -36,6 +36,8 @@ cloud.o-forge.io/core/oc-lib v0.0.0-20260429095623-9bb3d897b305 h1:1A6enYMMjK+2n cloud.o-forge.io/core/oc-lib v0.0.0-20260429095623-9bb3d897b305/go.mod h1:JynnOb3eMr9VZW1mHq+Vsl3tzx6gPhPsGKpQD/dtEBc= cloud.o-forge.io/core/oc-lib v0.0.0-20260527135023-cef23b5f307b h1:TWhmHeurbBmdyevREh4+mHWOBehO2AK587RCIjCfvOc= cloud.o-forge.io/core/oc-lib v0.0.0-20260527135023-cef23b5f307b/go.mod h1:JynnOb3eMr9VZW1mHq+Vsl3tzx6gPhPsGKpQD/dtEBc= +cloud.o-forge.io/core/oc-lib v0.0.0-20260529071252-7e5b69b1d2db h1:FxnOSk3PfgkSza6VVz9ZHga1kIQxioJDIVpy2T254j4= +cloud.o-forge.io/core/oc-lib v0.0.0-20260529071252-7e5b69b1d2db/go.mod h1:JynnOb3eMr9VZW1mHq+Vsl3tzx6gPhPsGKpQD/dtEBc= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0= github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM= diff --git a/infrastructure/docker_scraper.go b/infrastructure/docker_scraper.go index e844f56..55f038f 100644 --- a/infrastructure/docker_scraper.go +++ b/infrastructure/docker_scraper.go @@ -395,44 +395,44 @@ func splitParagraphs(text string) []string { // spdxCanonical maps lower-case SPDX-like tokens to their canonical form. var spdxCanonical = map[string]string{ - "mit": "MIT", - "apache-2": "Apache-2.0", - "apache-2.0": "Apache-2.0", - "apache2": "Apache-2.0", - "gpl-2": "GPL-2.0", - "gpl-2.0": "GPL-2.0", - "gpl-3": "GPL-3.0", - "gpl-3.0": "GPL-3.0", - "gpl2": "GPL-2.0", - "gpl3": "GPL-3.0", - "lgpl-2": "LGPL-2.0", - "lgpl-2.0": "LGPL-2.0", - "lgpl-2.1": "LGPL-2.1", - "lgpl-3": "LGPL-3.0", - "lgpl-3.0": "LGPL-3.0", - "bsd-2-clause": "BSD-2-Clause", - "bsd-3-clause": "BSD-3-Clause", - "mpl-2": "MPL-2.0", - "mpl-2.0": "MPL-2.0", - "isc": "ISC", - "cddl": "CDDL-1.0", - "agpl-3": "AGPL-3.0", - "agpl-3.0": "AGPL-3.0", - "postgresql": "PostgreSQL", - "psf": "PSF-2.0", - "psf-2": "PSF-2.0", - "psf-2.0": "PSF-2.0", - "artistic-1": "Artistic-1.0", - "artistic-2": "Artistic-2.0", - "epl-1": "EPL-1.0", - "epl-1.0": "EPL-1.0", - "epl-2": "EPL-2.0", - "epl-2.0": "EPL-2.0", - "eupl-1.1": "EUPL-1.1", - "eupl-1.2": "EUPL-1.2", - "wtfpl": "WTFPL", - "unlicense": "Unlicense", - "0bsd": "0BSD", + "mit": "MIT", + "apache-2": "Apache-2.0", + "apache-2.0": "Apache-2.0", + "apache2": "Apache-2.0", + "gpl-2": "GPL-2.0", + "gpl-2.0": "GPL-2.0", + "gpl-3": "GPL-3.0", + "gpl-3.0": "GPL-3.0", + "gpl2": "GPL-2.0", + "gpl3": "GPL-3.0", + "lgpl-2": "LGPL-2.0", + "lgpl-2.0": "LGPL-2.0", + "lgpl-2.1": "LGPL-2.1", + "lgpl-3": "LGPL-3.0", + "lgpl-3.0": "LGPL-3.0", + "bsd-2-clause": "BSD-2-Clause", + "bsd-3-clause": "BSD-3-Clause", + "mpl-2": "MPL-2.0", + "mpl-2.0": "MPL-2.0", + "isc": "ISC", + "cddl": "CDDL-1.0", + "agpl-3": "AGPL-3.0", + "agpl-3.0": "AGPL-3.0", + "postgresql": "PostgreSQL", + "psf": "PSF-2.0", + "psf-2": "PSF-2.0", + "psf-2.0": "PSF-2.0", + "artistic-1": "Artistic-1.0", + "artistic-2": "Artistic-2.0", + "epl-1": "EPL-1.0", + "epl-1.0": "EPL-1.0", + "epl-2": "EPL-2.0", + "epl-2.0": "EPL-2.0", + "eupl-1.1": "EUPL-1.1", + "eupl-1.2": "EUPL-1.2", + "wtfpl": "WTFPL", + "unlicense": "Unlicense", + "0bsd": "0BSD", } // normalizeSPDX returns the canonical SPDX identifier for a matched token.