diff --git a/Dockerfile b/Dockerfile index 75a9add5a..8d1a72ba0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -51,3 +51,45 @@ COPY --from=build-env /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/ USER svcuser EXPOSE 8080 ENTRYPOINT ["/wardenkms"] + +## spaceward +FROM node:lts-alpine as spaceward-builder +RUN npm install -g pnpm + +WORKDIR /wardenprotocol +COPY ts-client ./ts-client +RUN mkdir spaceward +COPY spaceward/package*.json spaceward/.npmrc spaceward/ +RUN cd spaceward && pnpm install +COPY . . + +ENV VITE_FAUCET_URL=%FAUCET_URL% +ENV VITE_WARDEN_RPC_URL=%WARDEN_RPC_URL% +ENV VITE_WARDEN_REST_URL=%WARDEN_REST_URL% +ENV VITE_WARDEN_CHAIN_ID_NUM=%WARDEN_CHAIN_ID_NUM% +ENV VITE_WARDEN_CHAIN_ID=%WARDEN_CHAIN_ID% +ENV VITE_WARDEN_CHAIN_NAME=%WARDEN_CHAIN_NAME% + +RUN cd spaceward && pnpm run build + +FROM nginx:1.25.3-alpine3.18-perl as spaceward +WORKDIR /var/www/app +EXPOSE 8080 + +COPY ./spaceward/entrypoint.sh /opt/entrypoint.sh +COPY ./spaceward/nginx.conf /etc/nginx/nginx.conf +COPY --from=spaceward-builder /wardenprotocol/spaceward/dist . + +RUN touch /var/run/nginx.pid && \ + chown -R 1000 /var/run/nginx.pid && \ + chown -R 1000 /var/cache/nginx && \ + chown -R 1000 /var/www/app && \ + chown -R 1000 /etc/nginx/conf.d/ && \ + mkdir -p /var/log/nginx && \ + mkdir -p /var/run/nginx && \ + chown -R 1000 /var/log/nginx && \ + chown -R 1000 /var/run/nginx/ + +USER 1000 +ENTRYPOINT ["sh", "/opt/entrypoint.sh"] +CMD ["nginx-fe"] diff --git a/spaceward/Dockerfile b/spaceward/Dockerfile deleted file mode 100644 index a7ac01f49..000000000 --- a/spaceward/Dockerfile +++ /dev/null @@ -1,38 +0,0 @@ -FROM node:lts-alpine as spaceward-builder -RUN npm install -g pnpm - -WORKDIR /app -COPY package*.json .npmrc . -RUN pnpm install - -COPY . . -ENV VITE_FAUCET_URL=%FAUCET_URL% -ENV VITE_WARDEN_RPC_URL=%WARDEN_RPC_URL% -ENV VITE_WARDEN_REST_URL=%WARDEN_REST_URL% -ENV VITE_WARDEN_CHAIN_ID_NUM=%WARDEN_CHAIN_ID_NUM% -ENV VITE_WARDEN_CHAIN_ID=%WARDEN_CHAIN_ID% -ENV VITE_WARDEN_CHAIN_NAME=%WARDEN_CHAIN_NAME% -RUN pnpm run build - - -FROM nginx:1.25.3-alpine3.18-perl as runner -WORKDIR /var/www/app -EXPOSE 8080 - -COPY entrypoint.sh /opt/entrypoint.sh -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=spaceward-builder /app/dist . - -RUN touch /var/run/nginx.pid && \ - chown -R 1000 /var/run/nginx.pid && \ - chown -R 1000 /var/cache/nginx && \ - chown -R 1000 /var/www/app && \ - chown -R 1000 /etc/nginx/conf.d/ && \ - mkdir -p /var/log/nginx && \ - mkdir -p /var/run/nginx && \ - chown -R 1000 /var/log/nginx && \ - chown -R 1000 /var/run/nginx/ - -USER 1000 -ENTRYPOINT ["sh", "/opt/entrypoint.sh"] -CMD ["nginx-fe"] diff --git a/spaceward/index.html b/spaceward/index.html index 1f5fe6e57..da99bde29 100644 --- a/spaceward/index.html +++ b/spaceward/index.html @@ -11,7 +11,7 @@
- + - \ No newline at end of file + diff --git a/spaceward/package.json b/spaceward/package.json index 3a8a1592d..c5b7734f5 100644 --- a/spaceward/package.json +++ b/spaceward/package.json @@ -4,7 +4,7 @@ "type": "module", "scripts": { "dev": "vite", - "build": "tsc && vite build", + "build": "vite build", "lint": "eslint src --ext ts,tsx --report-unused-disable-directives --max-warnings 0", "preview": "vite preview" }, @@ -78,6 +78,7 @@ "tailwindcss-animate": "^1.0.7", "use-debounce": "^9.0.4", "vite-plugin-node-polyfills": "^0.17.0", + "wardenprotocol-warden-client-ts": "file:../ts-client", "web3": "^4.3.0", "web3-eth-accounts": "^4.1.0", "zod": "^3.22.4" diff --git a/spaceward/pnpm-lock.yaml b/spaceward/pnpm-lock.yaml index 775d89f8d..6aa0f9e1a 100644 --- a/spaceward/pnpm-lock.yaml +++ b/spaceward/pnpm-lock.yaml @@ -212,6 +212,9 @@ dependencies: vite-plugin-node-polyfills: specifier: ^0.17.0 version: 0.17.0(vite@5.1.1) + wardenprotocol-warden-client-ts: + specifier: file:../ts-client + version: file:../ts-client(@cosmjs/proto-signing@0.32.2)(@cosmjs/stargate@0.32.2) web3: specifier: ^4.3.0 version: 4.4.0(typescript@5.3.3)(zod@3.22.4) @@ -1757,7 +1760,6 @@ packages: resolution: {integrity: sha512-HDEYOezWq//ug/R0lkOQWsaOYh3b9ECA8LN+tAA+baWMo81X9m9L63ux7NYw0QmoLxWqWrRO/T9F28+q2dw6+A==} dependencies: long: 4.0.0 - dev: true /@next/env@14.1.0: resolution: {integrity: sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw==} @@ -7643,3 +7645,21 @@ packages: /zod@3.22.4: resolution: {integrity: sha512-iC+8Io04lddc+mVqQ9AZ7OQ2MrUKGN+oIQyq1vemgt46jwCwLfhq7/pwnBnNXXXZb8VTVLKwp9EDkx+ryxIWmg==} dev: false + + file:../ts-client(@cosmjs/proto-signing@0.32.2)(@cosmjs/stargate@0.32.2): + resolution: {directory: ../ts-client, type: directory} + id: file:../ts-client + name: wardenprotocol-warden-client-ts + peerDependencies: + '@cosmjs/proto-signing': 0.32.2 + '@cosmjs/stargate': 0.32.2 + dependencies: + '@cosmjs/proto-signing': 0.32.2 + '@cosmjs/stargate': 0.32.2 + '@keplr-wallet/types': 0.12.67 + axios: 0.21.4 + buffer: 6.0.3 + events: 3.3.0 + transitivePeerDependencies: + - debug + dev: false