diff --git a/Dockerfile b/Dockerfile index 83d704c..2bc200a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ RUN apk add git RUN go install github.com/beego/bee/v2@latest -WORKDIR /oc-catalog +WORKDIR /oc-peer COPY --from=deps /go/pkg /go/pkg COPY --from=deps /app/go.mod /app/go.sum ./ @@ -29,7 +29,7 @@ COPY . . RUN sed -i '/replace/d' go.mod RUN bee pack -RUN mkdir -p /app/extracted && tar -zxvf oc-catalog.tar.gz -C /app/extracted +RUN mkdir -p /app/extracted && tar -zxvf oc-peer.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 #---------------------------------------------------------------------------------------------- @@ -37,10 +37,10 @@ RUN sed -i 's/http:\/\/127.0.0.1:8080\/swagger\/swagger.json/swagger.json/g' /ap FROM golang:alpine WORKDIR /app -COPY --from=builder /app/extracted/oc-catalog /usr/bin/ +COPY --from=builder /app/extracted/oc-peer /usr/bin/ COPY --from=builder /app/extracted/swagger /app/swagger -COPY --from=builder /app/extracted/docker_catalog.json /etc/oc/catalog.json +COPY --from=builder /app/extracted/docker_conf.json /etc/oc/peer.json EXPOSE 8080 -ENTRYPOINT ["oc-catalog"] +ENTRYPOINT ["oc-peer"] diff --git a/go.mod b/go.mod index c5117d6..d57e2e1 100755 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.22.0 toolchain go1.22.4 require ( - cloud.o-forge.io/core/oc-lib v0.0.0-20250108155542-0f4adeea86be + cloud.o-forge.io/core/oc-lib v0.0.0-20250110163958-fd1c579ec418 github.com/beego/beego/v2 v2.3.1 github.com/smartystreets/goconvey v1.7.2 ) diff --git a/go.sum b/go.sum index e5ff00e..45e60fd 100755 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -cloud.o-forge.io/core/oc-lib v0.0.0-20250108155542-0f4adeea86be h1:1Yf8ihUxXjOEPqcfgtXJpJ/slxBUHhf7AgS7DZI3iUk= -cloud.o-forge.io/core/oc-lib v0.0.0-20250108155542-0f4adeea86be/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo= +cloud.o-forge.io/core/oc-lib v0.0.0-20250110163958-fd1c579ec418 h1:24nc5qA6AkV6pIbJJeRASeUZmWuGkl+FO/r2oXazJ8w= +cloud.o-forge.io/core/oc-lib v0.0.0-20250110163958-fd1c579ec418/go.mod h1:ya7Q+zHhaKM+XF6sAJ+avqHEVzaMnFJQih2X3TlTlGo= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/beego/beego/v2 v2.3.1 h1:7MUKMpJYzOXtCUsTEoXOxsDV/UcHw6CPbaWMlthVNsc= github.com/beego/beego/v2 v2.3.1/go.mod h1:5cqHsOHJIxkq44tBpRvtDe59GuVRVv/9/tyVDxd5ce4=