Frontend configurable gateway endpoint (#704)

Co-authored-by: alabdao <139594838+alabdao@users.noreply.github.com> Co-authored-by: The Technocrat <josh.mcmenemy@openzyme.bio>
labdao · Oct 18, 2023 · 7243d1e · 7243d1e
1 parent 78d9acb
commit 7243d1e
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/frontend.yml b/.github/workflows/frontend.yml
@@ -24,7 +24,11 @@ jobs:
   docker:
     strategy:
       matrix:
-        backends: [{ env: stg, url: 'https://api.stg.labdao.xyz'}, { env: prod, url: 'https://api.prod.labdao.xyz'}, { env: local, url: 'http://localhost:8080'}]
+        backends: [
+          { env: stg, url: 'https://api.stg.labdao.xyz', gateway: 'http://bacalhau.stg.labdao.xyz:8080/ipfs/'}, 
+          { env: prod, url: 'https://api.prod.labdao.xyz', gateway: 'http://bacalhau.prod.labdao.xyz:8080/ipfs/'}, 
+          { env: local, url: 'http://localhost:8080', gateway: 'http://bacalhau.labdao.xyz:8080/ipfs/'}
+        ]
     runs-on: ubuntu-latest
     steps:
       - name: Dump GitHub context
@@ -61,11 +65,13 @@ jobs:
       - name: Build and push
         env:
           NEXT_PUBLIC_PRIVY_APP_ID: ${{ secrets.NEXT_PUBLIC_PRIVY_APP_ID }}
+          NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT: ${{ matrix.backends.gateway }}
         uses: docker/build-push-action@v5
         with:
           build-args: |
             NEXT_PUBLIC_BACKEND_URL=${{ matrix.backends.url }}
             NEXT_PUBLIC_PRIVY_APP_ID
+            NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT
           push: true
           context: frontend/
           tags: ${{ steps.meta.outputs.tags }}
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -129,7 +129,8 @@ services:
         - quay.io/labdao/frontend:latest
       args:
         NEXT_PUBLIC_PRIVY_APP_ID: $NEXT_PUBLIC_PRIVY_APP_ID
-        NEXT_PUBLIC_BACKEND_URL: http://localhost:8080
+        NEXT_PUBLIC_BACKEND_URL: ${NEXT_PUBLIC_BACKEND_URL:-http://localhost:8080}
+        NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT: ${NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT:-http://localhost:8080/ipfs/}
     environment:
       NODE_ENV: 'production'
     ports:

diff --git a/frontend/Dockerfile b/frontend/Dockerfile
@@ -3,9 +3,7 @@ FROM node:18-alpine AS base
 # Include NEXT_PUBLIC_BACKEND_URL and NEXT_PUBLIC_PRIVY_APP_ID
 ARG NEXT_PUBLIC_BACKEND_URL=http://localhost:8080
 ARG NEXT_PUBLIC_PRIVY_APP_ID
-
-ENV NEXT_PUBLIC_BACKEND_URL=$NEXT_PUBLIC_BACKEND_URL
-ENV NEXT_PUBLIC_PRIVY_APP_ID=$NEXT_PUBLIC_PRIVY_APP_ID
+ARG NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT
 
 # Install dependencies only when needed
 FROM base AS deps

diff --git a/frontend/app/datafile/list/page.tsx b/frontend/app/datafile/list/page.tsx
@@ -47,7 +47,7 @@ export default function ListDataFiles() {
           {datafiles.map((datafile, index) => (
             <TableRow key={index}>
               <TableCell>
-                <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${datafile.CID}/`}>
+                <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${datafile.CID}/`}>
                   {datafile.CID}
                 </a>
               </TableCell>

diff --git a/frontend/app/flow/detail/[cid]/page.tsx b/frontend/app/flow/detail/[cid]/page.tsx
@@ -40,12 +40,12 @@ export default function FlowDetail() {
   return (
     <Box maxWidth={800} margin="auto">
       <Typography gutterBottom>
-        <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${flow.CID}/`}>
+        <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${flow.CID}/`}>
           Name: {flow.Name}
         </a>
       </Typography>
       <Typography gutterBottom>
-        <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${flow.CID}/`}>
+        <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${flow.CID}/`}>
           CID: {flow.CID}
         </a>
       </Typography>
@@ -90,7 +90,7 @@ export default function FlowDetail() {
                 </TableCell>
                 <TableCell>{job.Tool.Name}</TableCell>
                 <TableCell>
-                  <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${job.Tool.CID}/`}>
+                  <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${job.Tool.CID}/`}>
                     {job.Tool.CID}
                   </a>
                 </TableCell>

diff --git a/frontend/app/flow/list/page.tsx b/frontend/app/flow/list/page.tsx
@@ -44,7 +44,7 @@ export default function ListToolFiles() {
                 </Link>
               </TableCell>
               <TableCell>
-                <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${flow.CID}/`}>
+                <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${flow.CID}/`}>
                   {flow.CID}
                 </a>
               </TableCell>

diff --git a/frontend/app/job/detail/[jobID]/page.tsx b/frontend/app/job/detail/[jobID]/page.tsx
@@ -88,7 +88,7 @@ export default function JobDetail() {
             {job.Inputs.map((inputDatafile, index) => (
               <TableRow key={index}>
                 <TableCell>
-                  <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${inputDatafile.CID}/`}>
+                  <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${inputDatafile.CID}/`}>
                     {inputDatafile.CID}
                   </a>
                 </TableCell>
@@ -113,7 +113,7 @@ export default function JobDetail() {
             {job.Outputs.map((outputDatafile, index) => (
               <TableRow key={index}>
                 <TableCell>
-                  <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${outputDatafile.CID}/`}>
+                  <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${outputDatafile.CID}/`}>
                     {outputDatafile.CID}
                   </a>
                 </TableCell>

diff --git a/frontend/app/tool/list/page.tsx b/frontend/app/tool/list/page.tsx
@@ -51,7 +51,7 @@ export default function ListToolFiles() {
             <TableRow key={index}>
               <TableCell>{tool.Name}</TableCell>
               <TableCell>
-                <a href={`http://bacalhau.labdao.xyz:8080/ipfs/${tool.CID}/`}>
+                <a href={`${process.env.NEXT_PUBLIC_IPFS_GATEWAY_ENDPOINT}${tool.CID}/`}>
                   {tool.CID}
                 </a>
               </TableCell>