Masv swagger

.dockerignore

@@ -0,0 +1,2 @@
+docs/
+pki/

Makefile

@@ -126,17 +126,13 @@ swagger-fmt:
 	swag fmt
 
 swagger-issuer:
-	swag init -d internal/issuer/apiv1/ -g client.go --output docs/issuer --parseDependency
-	swagger-fmt
+	swag init -d internal/issuer/apiv1/ -g client.go --output docs/issuer --parseDependency --packageName docs
 
 swagger-registry:
-	swag init -d internal/registry/apiv1/ -g client.go --output docs/registry --parseDependency
-	swagger-fmt
+	swag init -d internal/registry/apiv1/ -g client.go --output docs/registry --parseDependency --packageName docs
 
 swagger-datastore:
-	swag init -d internal/datastore/apiv1/ -g client.go --output docs/datastore --parseDependency
-	swagger-fmt
+	swag init -d internal/datastore/apiv1/ -g client.go --output docs/datastore --parseDependency --packageName docs
 
 swagger-verifier:
-	swag init -d internal/verifier/apiv1/ -g client.go --output docs/verifier --parseDependency
-	swagger-fmt
+	swag init -d internal/verifier/apiv1/ -g client.go --output docs/verifier --parseDependency --packageName docs

dev_haproxy.cfg

@@ -19,14 +19,15 @@ frontend stats
   stats uri /
   stats refresh 10s
 
-frontend front_http
-    bind 0.0.0.0:80
-    bind :::80
-
-    redirect scheme https code 301
-
-frontend front_https
-    bind *:443 ssl crt /etc/ssl/vc.pem alpn h2,http/1.1
+#frontend front_http
+#    bind 0.0.0.0:80
+#    bind :::80
+#
+#    redirect scheme https code 301
+
+frontend myfrontend
+   # bind *:443 ssl crt /etc/ssl/vc.pem alpn h2,http/1.1
+    bind *:80
     stats enable
 
     timeout http-request 10s                                                                                                                                                                                                                   

docker-compose.yaml

@@ -147,7 +147,7 @@ services:
     networks:
       - vc-net
     environment:
-      - "CA_SLEEP=20"
+      - "CA_SLEEP=2"
       - "CA_ADDR=vc_ca:8080"
 
 networks:

dockerfiles/datastore

@@ -5,18 +5,24 @@ WORKDIR /go/src/app
 
 COPY . .
 
+RUN go install github.com/swaggo/swag/cmd/swag@latest
+
+RUN swag init -d internal/datastore/apiv1/ -g client.go --output docs/datastore --parseDependency
+
+RUN swag fmt
+
 RUN --mount=type=cache,target=/root/.cache/go-build GOOS=linux GOARCH=amd64 go build -v -o bin/vc_datastore -ldflags "-w -s --extldflags '-static'" ./cmd/datastore/main.go
-#RUN GOOS=linux GOARCH=amd64 go build -v -o bin/vc_datastore -ldflags "-w -s --extldflags '-static'" ./cmd/datastore/main.go
 
 # Deploy
 FROM debian:bookworm-slim
 
 WORKDIR /
 
-RUN apt-get update && apt-get install -y curl procps iputils-ping
+RUN apt-get update && apt-get install -y curl procps iputils-ping less
 RUN rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /go/src/app/bin/vc_datastore /vc_datastore
+COPY --from=builder /go/src/app/docs /docs
 
 EXPOSE 8080
 

dockerfiles/issuer

@@ -18,7 +18,7 @@ FROM debian:bookworm-slim
 
 WORKDIR /
 
-RUN apt-get update && apt-get install -y curl procps iputils-ping
+RUN apt-get update && apt-get install -y curl procps iputils-ping less
 RUN rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /go/src/app/bin/vc_issuer /vc_issuer

dockerfiles/registry

@@ -12,7 +12,7 @@ FROM debian:bookworm-slim
 
 WORKDIR /
 
-RUN apt-get update && apt-get install -y curl procps iputils-ping
+RUN apt-get update && apt-get install -y curl procps iputils-ping less
 RUN rm -rf /var/lib/apt/lists/*
 
 

dockerfiles/verifier

@@ -12,7 +12,7 @@ FROM debian:bookworm-slim
 
 WORKDIR /
 
-RUN apt-get update && apt-get install -y curl procps iputils-ping
+RUN apt-get update && apt-get install -y curl procps iputils-ping less
 RUN rm -rf /var/lib/apt/lists/*