3 Commits
Author SHA1 Message Date
lumither b820f050bc feat(global) update multiple components
PBS - feat(global) new main page, tag filter system, docker compose deployment
2025-10-13 20:25:02 -04:00
lumither cf27de9eb4 Merge pull request #3 from Lumither/dev
Refactor Finished
2025-06-03 03:28:43 +08:00
lumither 3f02916e8f PBS from Lumither/refactor
Periodic Branch Synchronization
2025-04-13 04:02:54 -07:00
14 changed files with 19 additions and 231 deletions

No files matched your search

+1 -5
View File
@@ -16,8 +16,4 @@ WORK_DIR=/nocturne
# frontend settings
API_LOCAL_URL=http://backend:3001
API_REMOTE_URL=https://lumither.com/api
# deployment
USE_CR=true
CHANNEL=release
API_REMOTE_URL=https://lumither.com/api
-64
View File
@@ -1,64 +0,0 @@
name: build canary nocturne image
on:
push:
branches:
- master
env:
REGISTRY: cr.lmt.moe
TAG: canary
PROJECT: nocturne
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup builder
uses: docker/setup-buildx-action@v3
- name: registry login
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
- name: build containers
run: |
make build
- name: tag and push
run: |
PROJECT_NAME=$(basename "$PWD")
ALL_IMAGES=$(docker compose -f prod.compose.yaml config --services 2>/dev/null)
PULLED_IMAGES=$(docker compose -f prod.compose.yaml config 2>/dev/null \
| awk '/image:/ {print $2}' \
| sort -u \
| sed 's/:.*//' \
)
TO_PUSH=$(comm -23 \
<(echo "$ALL_IMAGES" | sort) \
<(echo "$PULLED_IMAGES") \
)
FMT_STRING=$(echo "$TO_PUSH" | xargs printf '%s, ' | sed 's/, $//')
echo "services to push: $FMT_STRING"
for SERVICE in $TO_PUSH; do
LOCAL_TAG="${PROJECT_NAME}-${SERVICE}:latest"
REMOTE_TAG="${REGISTRY}/${PROJECT}/${SERVICE}:${TAG}"
if docker image inspect "$LOCAL_TAG" >/dev/null 2>&1; then
echo "Pushing $REMOTE_TAG"
docker tag "$LOCAL_TAG" "$REMOTE_TAG"
docker push "$REMOTE_TAG"
else
echo "warn: image $LOCAL_TAG not found, skipping $SERVICE"
fi
done
-64
View File
@@ -1,64 +0,0 @@
name: build release nocturne image
on:
push:
branches:
- release
env:
REGISTRY: cr.lmt.moe
TAG: release
PROJECT: nocturne
jobs:
build:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
- name: setup builder
uses: docker/setup-buildx-action@v3
- name: registry login
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ secrets.REGISTRY_USERNAME }}
password: ${{ secrets.REGISTRY_PASSWORD }}
- name: build containers
run: |
make build
- name: tag and push
run: |
PROJECT_NAME=$(basename "$PWD")
ALL_IMAGES=$(docker compose -f prod.compose.yaml config --services 2>/dev/null)
PULLED_IMAGES=$(docker compose -f prod.compose.yaml config 2>/dev/null \
| awk '/image:/ {print $2}' \
| sort -u \
| sed 's/:.*//' \
)
TO_PUSH=$(comm -23 \
<(echo "$ALL_IMAGES" | sort) \
<(echo "$PULLED_IMAGES") \
)
FMT_STRING=$(echo "$TO_PUSH" | xargs printf '%s, ' | sed 's/, $//')
echo "services to push: $FMT_STRING"
for SERVICE in $TO_PUSH; do
LOCAL_TAG="${PROJECT_NAME}-${SERVICE}:latest"
REMOTE_TAG="${REGISTRY}/${PROJECT}/${SERVICE}:${TAG}"
if docker image inspect "$LOCAL_TAG" >/dev/null 2>&1; then
echo "Pushing $REMOTE_TAG"
docker tag "$LOCAL_TAG" "$REMOTE_TAG"
docker push "$REMOTE_TAG"
else
echo "warn: image $LOCAL_TAG not found, skipping $SERVICE"
fi
done
+6 -27
View File
@@ -3,42 +3,21 @@ ifeq ($(ARCH), arm64)
ARCH := aarch64
endif
ifneq (,$(wildcard ./.env))
include ./.env
export
endif
ifneq (,$(wildcard ./.env.local))
include ./.env.local
export
endif
USE_CR ?= false
CHANNEL ?= release
ifeq ($(USE_CR), true)
COMPOSE_FILE := prod.cr.compose.yaml
else
COMPOSE_FILE := prod.compose.yaml
endif
DOCKER_ENV := ARCH=$(ARCH) TAG=$(CHANNEL)
DOCKER_COMPOSE := $(DOCKER_ENV) docker compose -f $(COMPOSE_FILE)
.PHONY: all
all:up
.PHONY: build
build:
$(DOCKER_COMPOSE) pull
$(DOCKER_COMPOSE) build
ARCH=$(ARCH) docker compose -f prod.compose.yaml build
.PHONY: up
up:
$(DOCKER_COMPOSE) up -d
ARCH=$(ARCH) docker compose -f prod.compose.yaml up -d
.PHONY: down
down:
$(DOCKER_COMPOSE) down
ARCH=$(ARCH) docker compose -f prod.compose.yaml down
.PHONY: clean
clean:
$(DOCKER_COMPOSE) down --rmi all --volumes
.PHONY: rm
rm:
ARCH=$(ARCH) docker compose -f prod.compose.yaml rm
+2 -2
View File
@@ -27,10 +27,10 @@ services:
- ./blog_posts_git:/app/blog_posts_git:ro
env_file:
- ./container/dev/.env
postgres:
image: postgres:16.3
ports:
- "5432:5432"
- 5432:5432
env_file:
- ./container/dev/.env
+1 -1
View File
@@ -32,7 +32,7 @@ function BlogPostCard({ post, highlightSelector }: Props) {
<div className={ `w-full` }>
<Card
as={ Link } href={ `/blog/post/${ post.identifier }` }
className={ `group w-full dark:bg-[#353540]` }
className={ `group w-full` }
isPressable
isHoverable
>
+1 -5
View File
@@ -3,7 +3,6 @@
import React from 'react';
import { Chip } from '@nextui-org/react';
import { useRouter, useSearchParams } from 'next/navigation';
import { cn } from '@/src/utils';
interface TagChipProps {
tagName: string,
@@ -38,10 +37,7 @@ const TagChip = ({ tagName, isHighlighted }: TagChipProps) => {
className="cursor-pointer relative"
>
<Chip
className={ cn(
'hover:border-amber-400 hover:dark:border-amber-700 transition-all ',
!isHighlighted && 'dark:border-amber-50/25'
) }
className={ 'hover:border-amber-400 hover:dark:border-amber-700 transition-all' }
variant={ 'bordered' }
color={ isHighlighted ? 'warning' : 'default' }
>{ tagName }</Chip>
@@ -12,7 +12,7 @@ const ButtonGoBack = () => {
<Button
startContent={ <IoArrowBackOutline /> }
variant={ 'light' }
onPress={ () => router.back() }
onClick={ () => router.back() }
>
{ 'Back' }
</Button>
@@ -33,7 +33,7 @@ const Footer = (props: Props) => {
return (
<div className={ `w-full` }>
<div className={ 'flex transition bg-zinc-300/80 dark:bg-[#1c1c22]/50' }>
<div className={ 'flex transition bg-zinc-300/80 dark:bg-gray-600/25' }>
<div className={ `p-8 w-full overflow-hidden` }>
<div className={ 'relative' }>
<FaCreativeCommons
@@ -12,9 +12,9 @@ const MinifyPostCard = (props: Props) => {
const { post, desc } = props;
const img_url = post['header_img'] as string;
return (
<div className={ 'w-full transition hover:brightness-90' }>
<div className={ 'w-full transition hover:brightness-75' }>
<Card isFooterBlurred
className="w-full h-[300px] shadow-none border-0 rounded-none overflow-hidden dark:bg-[#353540]"
className="w-full h-[300px] shadow-none border-0 rounded-none overflow-hidden"
as={ Link }
isPressable
href={ `/blog/post/${ post['identifier'] }` }
@@ -16,7 +16,7 @@ async function PostCard(props: Props) {
return (
<div>
<Card className={ `max-w-full relative dark:bg-[#34343e]` }>
<Card className={ `max-w-full relative` }>
{/* card headers */ }
<Headers title={ post.title }
@@ -10,7 +10,7 @@ const TagChip = ({ tag }: { tag: string }) => {
return (
<div onClick={ () => router.push(`/blog?tags=${ tag }`) }>
<Chip
className={ 'hover:border-amber-400 hover:dark:border-amber-700 transition-all dark:bg-[#353540] dark:border-amber-50/25' }
className={ 'hover:border-amber-400 hover:dark:border-amber-700 transition-all' }
variant={ 'faded' }
>{ tag }</Chip>
</div>
+2 -3
View File
@@ -7,7 +7,7 @@ services:
dockerfile: ../container/release/frontend.containerfile
restart: always
ports:
- "0.0.0.0:3000:3000"
- "3000:3000"
env_file:
- ./.env
@@ -22,7 +22,7 @@ services:
ARCH: ${ARCH}
restart: always
ports:
- "0.0.0.0:3001:3001"
- "3001:3001"
env_file:
- ./.env
- ./.env.local
@@ -57,4 +57,3 @@ services:
timeout: 3s
retries: 10
start_period: 5s
restart: always
-54
View File
@@ -1,54 +0,0 @@
services:
frontend:
depends_on:
- backend
image: cr.lmt.moe/nocturne/frontend:${TAG}
restart: always
ports:
- "0.0.0.0:3000:3000"
env_file:
- ./.env
backend:
depends_on:
- migrate
image: cr.lmt.moe/nocturne/backend:${TAG}
restart: always
ports:
- "0.0.0.0:3001:3001"
env_file:
- ./.env
- ./.env.local
dns:
- 1.1.1.1
migrate:
image: postgres:17
depends_on:
postgres:
condition: service_healthy
env_file:
- ./.env
- ./.env.local
volumes:
- ./migration/ddl:/migrations:ro
- ./migration/migration.sh:/migration.sh:ro
entrypoint: [ "/bin/sh", "/migration.sh" ]
postgres:
image: postgres:17
ports:
- "5432:5432"
env_file:
- ./.env
- ./.env.local
healthcheck:
test: [ "CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB" ]
interval: 5s
timeout: 3s
retries: 10
start_period: 5s
restart: always