From ad5e7646c1d824c07f794aa275095167e8231af0 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 14 Jun 2021 12:13:38 +0200 Subject: [PATCH] Fixed infinite data fetching bug on homescreen. Docker files --- Dockerfile.multiarch | 24 ++++++++++++++++++++++++ README.md | 1 + client/src/components/Home/Home.tsx | 4 ++-- docker-compose.yml | 10 ++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 Dockerfile.multiarch create mode 100644 docker-compose.yml diff --git a/Dockerfile.multiarch b/Dockerfile.multiarch new file mode 100644 index 0000000..0cb1788 --- /dev/null +++ b/Dockerfile.multiarch @@ -0,0 +1,24 @@ +FROM node:14-alpine + +WORKDIR /app + +COPY package*.json ./ + +RUN apk --no-cache --virtual build-dependencies add python make g++ \ + && npm install --production + +COPY . . + +RUN mkdir -p ./public ./data \ + && cd ./client \ + && npm run build \ + && cd .. \ + && mv ./client/build/* ./public \ + && rm -rf ./client \ + && apk del build-dependencies + +EXPOSE 5005 + +ENV NODE_ENV=production + +CMD ["node", "server.js"] \ No newline at end of file diff --git a/README.md b/README.md index d61baa6..1e103ed 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ [![JS Badge](https://img.shields.io/badge/JavaScript-F7DF1E?style=for-the-badge&logo=javascript&logoColor=black)](https://shields.io/) [![TS Badge](https://img.shields.io/badge/TypeScript-007ACC?style=for-the-badge&logo=typescript&logoColor=white)](https://shields.io/) +[![Node Badge](https://img.shields.io/badge/Node.js-43853D?style=for-the-badge&logo=node.js&logoColor=white)](https://shields.io/) [![React Badge](https://img.shields.io/badge/React-20232A?style=for-the-badge&logo=react&logoColor=61DAFB)](https://shields.io/) ![Homescreen screenshot](./github/_home.png) diff --git a/client/src/components/Home/Home.tsx b/client/src/components/Home/Home.tsx index 854c04f..078c3a3 100644 --- a/client/src/components/Home/Home.tsx +++ b/client/src/components/Home/Home.tsx @@ -59,14 +59,14 @@ const Home = (props: ComponentProps): JSX.Element => { if (apps.length === 0) { getApps(); } - }, [getApps, apps]); + }, [getApps]); // Load bookmark categories useEffect(() => { if (categories.length === 0) { getCategories(); } - }, [getCategories, categories]); + }, [getCategories]); // Refresh greeter and time useEffect(() => { diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..4284290 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3" +services: + flame: + image: pawelmalak/flame + container_name: flame + volumes: + - /path/to/data:/app/data + ports: + - 5005:5005 + restart: unless-stopped \ No newline at end of file