Fix endpoint API paths

.gitignore

@@ -2,7 +2,7 @@
 crates/**/.privkey
 *.db
 
-test/summit-legacy/cache
-test/summit-legacy/db
-test/avalanche-legacy/cache
-test/avalanche-legacy/db
+test/**/state/cache
+test/**/state/db
+test/**/state/public
+test/**/state/staging

Dockerfile-legacy

@@ -20,12 +20,18 @@ RUN ~/dlang/install.sh install ldc-1.32.2
 RUN git clone https://github.com/serpent-os/libmoss.git
 RUN git clone https://github.com/serpent-os/moss-service.git
 RUN git clone https://github.com/serpent-os/summit.git
+RUN git clone https://github.com/serpent-os/vessel.git
 RUN git clone https://github.com/serpent-os/avalanche.git
 RUN --mount=type=cache,target=/root/.dub <<"EOT" /bin/bash
 	source ~/dlang/ldc-1.32.2/activate
 	cd summit
 	dub build --parallel
 EOT
+RUN --mount=type=cache,target=/root/.dub <<"EOT" /bin/bash
+	source ~/dlang/ldc-1.32.2/activate
+	cd vessel
+	dub build --parallel
+EOT
 RUN --mount=type=cache,target=/root/.dub <<"EOT" /bin/bash
 	source ~/dlang/ldc-1.32.2/activate
 	cd avalanche
@@ -36,6 +42,7 @@ FROM debian:bookworm-slim AS base
 RUN apt update
 RUN apt install -y \
 	git \
+	sudo \
 	libcurl4 \
 	libdbus-1-3 \
 	liblmdb0 \
@@ -49,14 +56,23 @@ RUN rm -rf /var/cache/apt/archives /var/lib/apt/lists/*
 
 FROM base as summit
 COPY --from=builder /summit /app
+RUN rm /app/seed.json
 VOLUME /app/state
+VOLUME /app/seed.json
 EXPOSE 5000
 WORKDIR /app
 CMD ["/app/summit", "-a", "0.0.0.0", "-p", "5000"]
 
+FROM base as vessel
+COPY --from=builder /vessel /app
+VOLUME /app/state
+EXPOSE 5001
+WORKDIR /app
+CMD ["/app/vessel", "-a", "0.0.0.0", "-p", "5001"]
+
 FROM base as avalanche
 COPY --from=builder /avalanche /app
-RUN mkdir -p /app/public
+RUN mkdir -p /app/public && chmod 777 /app/public
 RUN mkdir -p /var/cache/boulder
 VOLUME /app/state
 EXPOSE 5002

crates/service-types/src/api/v1/services.rs

@@ -28,15 +28,15 @@ operation!(
 operation!(
     RefreshToken,
     GET,
-    "services/refreshToken",
+    "services/refresh_token",
     NOT_EXPIRED | BEARER_TOKEN | SERVICE_ACCOUNT,
     resp: String
 );
 
 operation!(
     RefreshIssueToken,
     GET,
-    "services/refreshIssueToken",
+    "services/refresh_issue_token",
     BEARER_TOKEN | SERVICE_ACCOUNT,
     resp: String
 );

justfile

@@ -15,7 +15,7 @@ docker-build-legacy target:
 	@docker build . -t serpentos/{{target}}-legacy --target {{target}} -f Dockerfile-legacy  
 
 # Build docker containers
-build: (docker-build-legacy "summit") (docker-build-legacy "avalanche") (docker-build "vessel")
+build: (docker-build-legacy "summit") (docker-build-legacy "avalanche") (docker-build-legacy "vessel")
 
 # Bring up docker containers
 up: build

test/Caddyfile

@@ -0,0 +1,4 @@
+caddy:80, localhost:80 {
+	root * /static/
+	file_server browse
+}

test/docker-compose.yaml

@@ -1,33 +1,39 @@
 services:
-  # summit:
-  #   image: serpentos/summit
-  #   ports:
-  #     - "5000:5000"
-  #   volumes:
-  #     - ./summit:/state
-  #   user: ${MY_UID}:${MY_GID}
-  #   depends_on:
-  #     vessel:
-  #       condition: service_started
-  #       restart: true
+  # Legacy
   summit:
     image: serpentos/summit-legacy
     ports:
       - "5000:5000"
     volumes:
-      - ./summit-legacy:/app/state
+      - ./summit-legacy/state:/app/state
+      - ./summit-legacy/seed.json:/app/seed.json
     user: ${MY_UID}:${MY_GID}
   vessel:
-    image: serpentos/vessel
+    image: serpentos/vessel-legacy
     ports:
       - "5001:5001"
     volumes:
-      - ./vessel:/state
+      - ./vessel-legacy/state:/app/state
     user: ${MY_UID}:${MY_GID}
   avalanche:
     image: serpentos/avalanche-legacy
     ports:
       - "5002:5002"
     volumes:
-      - ./avalanche-legacy:/app/state
+      - ./avalanche-legacy/state:/app/state
     user: ${MY_UID}:${MY_GID}
+  caddy:
+    image: caddy:2
+    ports: 
+      - "5003:80"
+    volumes:
+      - ./vessel-legacy/state/public:/static
+      - ./Caddyfile:/etc/caddy/Caddyfile
+  # Rust
+  # vessel:
+  #   image: serpentos/vessel
+  #   ports:
+  #     - "5001:5001"
+  #   volumes:
+  #     - ./vessel:/state
+  #   user: ${MY_UID}:${MY_GID}

test/summit-legacy/seed.json

@@ -0,0 +1,27 @@
+{
+    "projects":
+    [
+        {
+            "name": "Test",
+            "slug": "test",
+            "description": "Test recipes",
+            "profiles":
+            [
+                {
+                    "name": "test-x86_64",
+                    "arch": "x86_64",
+                    "indexURI": "http://caddy/volatile/x86_64/stone.index",
+                    "remotes": []
+                }
+            ],
+            "repos":
+            [
+                {
+                    "name": "recipes",
+                    "summary": "Test recipes",
+                    "uri": "https://github.com/tarkah/recipes.git"
+                },
+            ]
+        }
+    ]
+}

test/vessel-legacy/state/.pubkey

@@ -0,0 +1 @@
+��Qm��Fϝ0ʛ~��չ
�}•GH��4*