Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update remix monorepo to v2 (major) #149

Merged
merged 7 commits into from
Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/build-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:

- name: Setup Python for pre-commit
uses: actions/setup-python@v4
with:
python-version: "3.12"

- name: Run pre-commit checks
uses: pre-commit/[email protected]
Expand Down
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ build:

install:
docker-compose run --rm ui npm install
docker-compose run --rm ui ./node_modules/.bin/remix setup node

chown:
docker-compose run --rm ui chown -R 1000:1000 .cache build public/build
Expand Down
10 changes: 5 additions & 5 deletions src/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
# Do not use an alpine image (https://martinheinz.dev/blog/92)
FROM node:20.8.0-bookworm-slim AS base

RUN apt-get update && apt-get install -y \
RUN apt-get update && apt-get install -y --no-install-recommends \
ca-certificates \
curl \
dumb-init \
procps
procps \
&& apt-get clean

# renovate: datasource=github-releases depName=bitnami-labs/sealed-secrets
ARG KUBESEAL_VERSION=v0.24.1
Expand All @@ -23,11 +25,9 @@ FROM base AS build

COPY package*.json ./
RUN npm ci
RUN ./node_modules/.bin/remix setup node

COPY . .
RUN npm run build
RUN ls -la build


# RUNTIME
Expand All @@ -40,4 +40,4 @@ COPY --from=build /srv/build /srv/build
COPY --from=build /srv/public /srv/public

# https://engineeringblog.yelp.com/2016/01/dumb-init-an-init-for-docker.html
CMD [ "dumb-init", "./node_modules/.bin/remix-serve", "build" ]
CMD [ "dumb-init", "./node_modules/.bin/remix-serve", "build/index.js" ]
4 changes: 2 additions & 2 deletions src/app/root.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { LinksFunction, V2_MetaFunction } from '@remix-run/node';
import type { LinksFunction, MetaFunction } from '@remix-run/node';
import {
Links,
LiveReload,
Expand All @@ -23,7 +23,7 @@ export const links: LinksFunction = () => [
},
];

export const meta: V2_MetaFunction = () => {
export const meta: MetaFunction = () => {
return [{ title: 'kubeseal UI' }];
};

Expand Down
Loading