fix: dockerfile

goat-community · Oct 25, 2023 · befb956 · befb956
1 parent 2c2a958
commit befb956
Show file tree

Hide file tree

Showing 18 changed files with 61 additions and 342 deletions.
diff --git a/.env.docker b/.env.docker
diff --git a/.husky/.gitignore b/.husky/.gitignore
diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-cd ./app/client && npx --no -- commitlint --edit ${1}
+npx --no -- commitlint --edit ${1}
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,4 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
-cd ./app/client && pnpm lint
+pnpm lint
diff --git a/apps/goat/app/[lng]/(dashboard)/settings/settings/PersonalPreferences.tsx b/apps/goat/app/[lng]/(dashboard)/settings/settings/PersonalPreferences.tsx
diff --git a/apps/goat/app/[lng]/(dashboard)/settings/settings/Profile.tsx b/apps/goat/app/[lng]/(dashboard)/settings/settings/Profile.tsx
diff --git a/apps/goat/app/[lng]/(dashboard)/settings/settings/layout.tsx b/apps/goat/app/[lng]/(dashboard)/settings/settings/layout.tsx
diff --git a/apps/goat/public/assets/poi-icons/circle.svg b/apps/goat/public/assets/poi-icons/circle.svg
diff --git a/apps/goat/public/assets/poi-icons/star.svg b/apps/goat/public/assets/poi-icons/star.svg
diff --git a/apps/web/Dockerfile b/apps/web/Dockerfile
@@ -7,7 +7,6 @@ RUN apk update
 WORKDIR /app
 RUN npm install -g turbo
 COPY . .
-COPY .env.docker /app/apps/web/.env
 RUN turbo prune --scope=@p4b/web --docker
 
 # Add lockfile and package.json's of isolated subworkspace
@@ -24,9 +23,18 @@ RUN pnpm install --frozen-lockfile
 
 # Build the project
 COPY --from=builder /app/out/full/ .
+
+ARG NEXT_PUBLIC_APP_URL=APP_NEXT_PUBLIC_APP_URL
+ARG NEXT_PUBLIC_MAP_TOKEN=APP_NEXT_PUBLIC_MAP_TOKEN
+ARG NEXT_PUBLIC_ACCOUNTS_API_URL=APP_NEXT_PUBLIC_ACCOUNTS_API_URL
+ARG NEXT_PUBLIC_GEOAPI_URL=APP_NEXT_PUBLIC_GEOAPI_URL
+ARG NEXT_PUBLIC_API_URL=APP_NEXT_PUBLIC_API_URL
+
 RUN pnpm dlx turbo run build --filter=web
 
 FROM base AS runner
+RUN apk add bash
+
 WORKDIR /app
 
 # Don't run production as root
@@ -45,4 +53,6 @@ COPY --from=installer --chown=nextjs:nodejs /app/apps/web/public ./apps/web/publ
 
 ENV HOSTNAME localhost
 
+COPY ./apps/web/entrypoint.sh /app/apps/web/entrypoint.sh
+ENTRYPOINT ["/app/apps/web/entrypoint.sh"]
 CMD node apps/web/server.js
diff --git a/apps/web/components/dashboard/common/FoldersTreeView.tsx b/apps/web/components/dashboard/common/FoldersTreeView.tsx
@@ -129,7 +129,7 @@ export default function FoldersTreeView(props: FoldersTreeViewProps) {
 
           setEditModal(undefined);
         }}
-        existingFolderNames={folders?.items?.map((folder) => folder.name)}
+        existingFolderNames={folders?.map((folder) => folder.name)}
         selectedFolder={editModal?.selectedFolder}
       />
 
@@ -138,7 +138,7 @@ export default function FoldersTreeView(props: FoldersTreeViewProps) {
         component="nav"
         aria-labelledby="content-tree-view"
       >
-        {[folders?.items ?? [], teams ?? [], organizations ?? []].map(
+        {[folders ?? [], teams ?? [], organizations ?? []].map(
           (folder, typeIndex) => (
             <div key={typeIndex}>
               <ListItemButton