core/oc-catalog
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bad copypasta

Browse Source
This commit is contained in:
plm 2025-01-15 16:34:41 +01:00
parent 111ace605b
commit 914e3134c2
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -15,7 +15,7 @@ RUN apk add git
RUN go install github.com/beego/bee/v2@latest RUN go install github.com/beego/bee/v2@latest
WORKDIR /oc-peer WORKDIR /oc-catalog
COPY --from=deps /go/pkg /go/pkg COPY --from=deps /go/pkg /go/pkg
COPY --from=deps /app/go.mod /app/go.sum ./ COPY --from=deps /app/go.mod /app/go.sum ./
@ -29,7 +29,7 @@ COPY . .
RUN sed -i '/replace/d' go.mod RUN sed -i '/replace/d' go.mod
RUN bee pack RUN bee pack
RUN mkdir -p /app/extracted && tar -zxvf oc-peer.tar.gz -C /app/extracted RUN mkdir -p /app/extracted && tar -zxvf oc-catalog.tar.gz -C /app/extracted
RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /app/extracted/swagger/index.html RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /app/extracted/swagger/index.html
#---------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------
@ -37,10 +37,10 @@ RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /ap
FROM golang:alpine FROM golang:alpine
WORKDIR /app WORKDIR /app
COPY --from=builder /app/extracted/oc-peer /usr/bin/ COPY --from=builder /app/extracted/oc-catalog /usr/bin/
COPY --from=builder /app/extracted/swagger /app/swagger COPY --from=builder /app/extracted/swagger /app/swagger
COPY --from=builder /app/extracted/docker_conf.json /etc/oc/peer.json COPY --from=builder /app/extracted/docker_catalog.json /etc/oc/catalog.json
EXPOSE 8080 EXPOSE 8080
ENTRYPOINT ["oc-peer"] ENTRYPOINT ["oc-catalog"]

9
main.go
View File

@ -6,6 +6,7 @@ import (
oclib "cloud.o-forge.io/core/oc-lib" oclib "cloud.o-forge.io/core/oc-lib"
"cloud.o-forge.io/core/oc-lib/tools" "cloud.o-forge.io/core/oc-lib/tools"
beego "github.com/beego/beego/v2/server/web" beego "github.com/beego/beego/v2/server/web"
"github.com/beego/beego/v2/server/web/filter/cors"
) )
const appname = "oc-catalog" const appname = "oc-catalog"
@ -32,6 +33,12 @@ func main() {
beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger" beego.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
api := &tools.API{} api := &tools.API{}
api.Discovered(beego.BeeApp.Handlers.GetAllControllerInfo()) api.Discovered(beego.BeeApp.Handlers.GetAllControllerInfo())
beego.InsertFilter("*", beego.BeforeRouter, cors.Allow(&cors.Options{
AllowAllOrigins: true,
AllowMethods: []string{"GET", "POST", "PUT", "DELETE", "OPTIONS"},
AllowHeaders: []string{"Origin", "Authorization", "Content-Type"},
ExposeHeaders: []string{"Content-Length", "Content-Type"},
AllowCredentials: true,
}))
beego.Run() beego.Run()
} }