From 4d98771757eae5c2f81d07d396b7888706040e0c Mon Sep 17 00:00:00 2001 From: Vo Van Nghia Date: Tue, 9 Jan 2024 09:52:50 +0700 Subject: [PATCH 1/8] docker: use concurrently instead of supervisord --- Dockerfile | 7 +++---- config/supervisord.conf | 15 --------------- 2 files changed, 3 insertions(+), 19 deletions(-) delete mode 100644 config/supervisord.conf diff --git a/Dockerfile b/Dockerfile index 930096ea69..a9ebf4dd26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,12 +43,10 @@ COPY . . RUN ./apps/backend/ci/build-app.sh FROM $NODE_BASE_IMAGE -COPY --from=caddy:2.7.5 /usr/bin/caddy /usr/local/bin/caddy -RUN apt-get update && apt-get install -y --no-install-recommends curl supervisor ca-certificates && rm -rf /var/lib/apt/lists/* +RUN npm install -g concurrently && concurrently --version RUN useradd -m -u 1001 ryot WORKDIR /home/ryot USER ryot -COPY config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY config/Caddyfile /etc/caddy/Caddyfile COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/node_modules ./node_modules COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/package.json ./package.json @@ -57,4 +55,5 @@ COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/public ./publi COPY --from=app-builder --chown=ryot:ryot /app/ryot /usr/local/bin/ryot HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -f http://localhost:5000/config || exit 1 -CMD [ "/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf" ] +ENV API_URL=http://localhost:5000 +CMD [ "concurrently", "--names", "frontend,backend,proxy", "-k", "npx remix-serve ./build/index.js", "ryot", "caddy run --config /etc/caddy/Caddyfile" ] diff --git a/config/supervisord.conf b/config/supervisord.conf deleted file mode 100644 index a038b1fb68..0000000000 --- a/config/supervisord.conf +++ /dev/null @@ -1,15 +0,0 @@ -[supervisord] -nodaemon=true -user=ryot - -[program:backend] -command=ryot -environment= - -[program:frontend] -command=yarn remix-serve ./build/index.js -environment=API_URL=http://localhost:5000 - -[program:reverse-proxy] -command=caddy run --config /etc/caddy/Caddyfile -environment= From 958d4aa7c8d760b5c31590986705a18de224a1b5 Mon Sep 17 00:00:00 2001 From: Nghia Date: Tue, 9 Jan 2024 12:30:55 +0700 Subject: [PATCH 2/8] fix typo --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a9ebf4dd26..e13617df72 100644 --- a/Dockerfile +++ b/Dockerfile @@ -43,6 +43,7 @@ COPY . . RUN ./apps/backend/ci/build-app.sh FROM $NODE_BASE_IMAGE +COPY --from=caddy:2.7.5 /usr/bin/caddy /usr/local/bin/caddy RUN npm install -g concurrently && concurrently --version RUN useradd -m -u 1001 ryot WORKDIR /home/ryot From 83b65dc3badc719f1b65f494349981ba03625aa1 Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Tue, 9 Jan 2024 13:18:14 +0530 Subject: [PATCH 3/8] chore(frontend): set default api url --- apps/frontend/app/lib/api.server.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/frontend/app/lib/api.server.ts b/apps/frontend/app/lib/api.server.ts index b80a32c598..3d35736ec3 100644 --- a/apps/frontend/app/lib/api.server.ts +++ b/apps/frontend/app/lib/api.server.ts @@ -8,7 +8,7 @@ import { redirectToQueryParam } from "./generals"; import { createToastHeaders } from "./toast.server"; import { combineHeaders, getLogoutCookies } from "./utilities.server"; -export const API_URL = process.env.API_URL; +export const API_URL = process.env.API_URL || 'http://localhost:5000'; export const gqlClient = new GraphQLClient(`${API_URL}/graphql`, { headers: { Connection: "keep-alive" }, From 2a148252e9520512f9ca1a92b15212327db95647 Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Tue, 9 Jan 2024 13:18:26 +0530 Subject: [PATCH 4/8] ci: adjust to new backend --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index e13617df72..a7d6128491 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,7 +44,7 @@ RUN ./apps/backend/ci/build-app.sh FROM $NODE_BASE_IMAGE COPY --from=caddy:2.7.5 /usr/bin/caddy /usr/local/bin/caddy -RUN npm install -g concurrently && concurrently --version +RUN npm install --global concurrently && concurrently --version RUN useradd -m -u 1001 ryot WORKDIR /home/ryot USER ryot @@ -56,5 +56,4 @@ COPY --from=frontend-builder --chown=ryot:ryot /app/apps/frontend/public ./publi COPY --from=app-builder --chown=ryot:ryot /app/ryot /usr/local/bin/ryot HEALTHCHECK --interval=5m --timeout=3s \ CMD curl -f http://localhost:5000/config || exit 1 -ENV API_URL=http://localhost:5000 CMD [ "concurrently", "--names", "frontend,backend,proxy", "-k", "npx remix-serve ./build/index.js", "ryot", "caddy run --config /etc/caddy/Caddyfile" ] From 7515cfac151456bd7efdc57a7f1c5766b1ad4cfc Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Tue, 9 Jan 2024 13:27:03 +0530 Subject: [PATCH 5/8] ci: add required packages --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index a7d6128491..8b2d3da17f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -44,6 +44,7 @@ RUN ./apps/backend/ci/build-app.sh FROM $NODE_BASE_IMAGE COPY --from=caddy:2.7.5 /usr/bin/caddy /usr/local/bin/caddy +RUN apt-get update && apt-get install -y --no-install-recommends curl ca-certificates && rm -rf /var/lib/apt/lists/* RUN npm install --global concurrently && concurrently --version RUN useradd -m -u 1001 ryot WORKDIR /home/ryot From 1683d06c5b9fdbfdf7ce5269f98d11ccaa5e7afc Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Tue, 9 Jan 2024 21:06:00 +0530 Subject: [PATCH 6/8] fix(backend): deploy bulk metadata update --- apps/backend/src/miscellaneous/resolver.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/backend/src/miscellaneous/resolver.rs b/apps/backend/src/miscellaneous/resolver.rs index eda10353ab..2e40a7477a 100644 --- a/apps/backend/src/miscellaneous/resolver.rs +++ b/apps/backend/src/miscellaneous/resolver.rs @@ -2671,6 +2671,7 @@ impl MiscellaneousService { let many_metadata = Metadata::find() .select_only() .column(metadata::Column::Id) + .filter(metadata::Column::IsPartial.eq(false)) .order_by_asc(metadata::Column::LastUpdatedOn) .into_tuple::() .all(&self.db) From f95a2f050cfcde977f023b3b08f7e8494095666c Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Wed, 10 Jan 2024 19:55:48 +0530 Subject: [PATCH 7/8] chore(frontend): apply lints --- apps/frontend/app/lib/api.server.ts | 2 +- apps/frontend/app/lib/hooks.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/frontend/app/lib/api.server.ts b/apps/frontend/app/lib/api.server.ts index 3d35736ec3..d93abe3202 100644 --- a/apps/frontend/app/lib/api.server.ts +++ b/apps/frontend/app/lib/api.server.ts @@ -8,7 +8,7 @@ import { redirectToQueryParam } from "./generals"; import { createToastHeaders } from "./toast.server"; import { combineHeaders, getLogoutCookies } from "./utilities.server"; -export const API_URL = process.env.API_URL || 'http://localhost:5000'; +export const API_URL = process.env.API_URL || "http://localhost:5000"; export const gqlClient = new GraphQLClient(`${API_URL}/graphql`, { headers: { Connection: "keep-alive" }, diff --git a/apps/frontend/app/lib/hooks.ts b/apps/frontend/app/lib/hooks.ts index ceab632222..f99c3b3ec4 100644 --- a/apps/frontend/app/lib/hooks.ts +++ b/apps/frontend/app/lib/hooks.ts @@ -2,9 +2,9 @@ import { $path } from "@ignisda/remix-routes"; import { useMantineTheme } from "@mantine/core"; import { useNavigate, useSearchParams } from "@remix-run/react"; import { useAtom } from "jotai"; +import Cookies from "js-cookie"; import { COOKIES_KEYS, getStringAsciiValue } from "./generals"; import { InProgressWorkout, currentWorkoutAtom } from "./workout"; -import Cookies from "js-cookie"; export function useGetMantineColor() { const theme = useMantineTheme(); From b5abcd2405db5e812547dcfe1dd437bd48b62e2e Mon Sep 17 00:00:00 2001 From: Diptesh Choudhuri Date: Wed, 10 Jan 2024 19:56:14 +0530 Subject: [PATCH 8/8] build(backend): bump version --- Cargo.lock | 2 +- apps/backend/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2d3cc99eca..7defd822d7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4264,7 +4264,7 @@ checksum = "dc31bd9b61a32c31f9650d18add92aa83a49ba979c143eefd27fe7177b05bd5f" [[package]] name = "ryot" -version = "4.0.14" +version = "4.0.15" dependencies = [ "anyhow", "apalis", diff --git a/apps/backend/Cargo.toml b/apps/backend/Cargo.toml index 647b21b881..ef2d31d93f 100644 --- a/apps/backend/Cargo.toml +++ b/apps/backend/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ryot" -version = "4.0.14" +version = "4.0.15" edition = "2021" repository = "https://github.com/IgnisDa/ryot" license = "GPL-V3"