Merge pull request #98 from MinBZK/fix/env-vars

fix: image env vars
MinBZK · Dec 12, 2022 · 3a59b64 · 3a59b64
2 parents 69a9c73 + fd27e2d
commit 3a59b64
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/apps/web/dockerfile.dev b/apps/web/dockerfile.dev
@@ -19,4 +19,8 @@ RUN --mount=type=cache,id=pnpm-store,target=/root/.pnpm-store\
 
 ADD . .
 
+ENV CMS_API=http://cms:9001/api
+
+ENV NEXT_PUBLIC_CMS_ROOT_URL=http://cms.localhost/
+
 CMD pnpm dev:web
diff --git a/apps/web/src/pages/methoden.tsx b/apps/web/src/pages/methoden.tsx
@@ -11,19 +11,20 @@ const Methoden: React.FC<Props> = ({ methods }) => {
     <Stack spacing={2}>
       <Typography variant="h3">Methoden</Typography>
       <Box display="grid" gridTemplateColumns="repeat(3, 1fr)" columnGap={4} alignItems="flex-start">
-        {methods.data.map((method) => {
+        {methods.data?.map((method) => {
           const mediaURL = new URL(
-            `/cms${method.attributes.Visual?.data.attributes.formats.medium.url}`,
-            process.env.NEXT_PUBLIC_CMS_API
+            `${method.attributes.Visual?.data.attributes.formats.medium.url}`,
+            process.env.NEXT_PUBLIC_CMS_ROOT_URL
           );
+
           return (
             <Card key={method.id}>
-              {/* <CardMedia
+              <CardMedia
                 component="img"
                 height="300"
                 image={mediaURL.toString()}
                 alt={method.attributes.Visual?.data.attributes.formats.medium.name}
-              /> */}
+              />
               <CardContent>
                 <Typography gutterBottom variant="h5" component="div">
                   {method.attributes.Title}

diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -10,8 +10,6 @@ services:
       - .env
   web:
     restart: always
-    environment:
-      - CMS_API=http://cms:9001/api
     build:
       context: .
       dockerfile: apps/web/dockerfile.prod