Compare commits

...

2 Commits

Author SHA1 Message Date
0416ab7f9e feat: release 2.14.0
All checks were successful
test-build / guarddog (push) Successful in 30s
release-image-gitea / build (push) Successful in 48s
renovate / renovate (push) Successful in 2m21s
release-image-gitea / release (push) Successful in 1m57s
test-build / build (push) Successful in 4m7s
release-image-harbor / build (push) Successful in 6m46s
release-image-harbor / release (push) Successful in 4m20s
2026-02-18 21:48:17 -06:00
6f1728a909 feat: move url configuration to support file 2026-02-18 21:47:53 -06:00
10 changed files with 14 additions and 23 deletions

View File

@@ -22,12 +22,7 @@ WORKDIR /app
COPY --from=prod-deps /app/node_modules /app/node_modules COPY --from=prod-deps /app/node_modules /app/node_modules
COPY --from=build /app/dist /app/dist COPY --from=build /app/dist /app/dist
ENV HOST=0.0.0.0 LABEL version="2.14.0"
ENV SITE_URL=https://www.alexlebens.dev
ENV DIRECTUS_URL=https://directus.alexlebens.net
ENV PORT=4321
LABEL version="2.13.1"
LABEL description="Astro based personal website" LABEL description="Astro based personal website"
EXPOSE $PORT EXPOSE $PORT

View File

@@ -9,12 +9,7 @@ import tailwindcss from '@tailwindcss/vite';
import icon from 'astro-icon'; import icon from 'astro-icon';
import swup from '@swup/astro'; import swup from '@swup/astro';
const getSiteURL = () => { import { getSiteURL } from './src/support/url';
if (process.env.SITE_URL) {
return `https://${process.env.SITE_URL}`;
}
return 'http://localhost:4321';
};
export default defineConfig({ export default defineConfig({
site: getSiteURL(), site: getSiteURL(),

View File

@@ -1,7 +1,7 @@
{ {
"name": "site-profile", "name": "site-profile",
"type": "module", "type": "module",
"version": "2.13.1", "version": "2.14.0",
"homepage": "https://www.alexlebens.dev", "homepage": "https://www.alexlebens.dev",
"bugs": { "bugs": {
"url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues", "url": "https://gitea.alexlebens.dev/alexlebens/site-profile/issues",

View File

@@ -4,8 +4,8 @@ import { Icon } from 'astro-icon/components';
import type { Post } from '@lib/directusTypes'; import type { Post } from '@lib/directusTypes';
import Image from '@components/ui/images/Image.astro'; import Image from '@components/ui/images/Image.astro';
import { getDirectusImageURL } from '@lib/directusFunctions';
import { formatDate } from '@support/time'; import { formatDate } from '@support/time';
import { getDirectusImageURL } from '@/support/url';
interface Props { interface Props {
post: Post; post: Post;

View File

@@ -2,7 +2,7 @@
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Logo from '@components/ui/logos/Logo.astro'; import Logo from '@components/ui/logos/Logo.astro';
import { getDirectusImageURL } from '@lib/directusFunctions'; import { getDirectusImageURL } from '@/support/url';
interface Props { interface Props {
topic: string; topic: string;

View File

@@ -2,7 +2,7 @@
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Image from '@components/ui/images/Image.astro'; import Image from '@components/ui/images/Image.astro';
import { getDirectusImageURL } from '@lib/directusFunctions'; import { getDirectusImageURL } from '@/support/url';
interface Props { interface Props {
title: string; title: string;

View File

@@ -2,7 +2,7 @@
import { Icon } from 'astro-icon/components'; import { Icon } from 'astro-icon/components';
import Image from '@components/ui/images/Image.astro'; import Image from '@components/ui/images/Image.astro';
import { getDirectusImageURL } from '@lib/directusFunctions'; import { getDirectusImageURL } from '@/support/url';
interface Props { interface Props {
title: string; title: string;

View File

@@ -12,7 +12,7 @@ import type {
Skill, Skill,
} from '@lib/directusTypes'; } from '@lib/directusTypes';
import { getDirectusURL } from '@lib/directusFunctions'; import { getDirectusURL } from '@/support/url';
type Schema = { type Schema = {
site_global: Global; site_global: Global;

View File

@@ -10,8 +10,8 @@ import Image from '@components/ui/images/Image.astro';
import SocialShareButton from '@components/buttons/SocialShareButton.astro'; import SocialShareButton from '@components/buttons/SocialShareButton.astro';
import BaseLayout from '@layouts/BaseLayout.astro'; import BaseLayout from '@layouts/BaseLayout.astro';
import directus from '@lib/directus'; import directus from '@lib/directus';
import { getDirectusImageURL } from '@lib/directusFunctions';
import { formatDate } from '@support/time'; import { formatDate } from '@support/time';
import { getDirectusImageURL } from '@/support/url';
const post = Astro.props; const post = Astro.props;

View File

@@ -1,12 +1,13 @@
const getDirectusURL = () => { const getDirectusURL = () => {
if (process.env.DIRECTUS_URL) {
return `https://${process.env.DIRECTUS_URL}`;
}
return 'https://directus.alexlebens.net'; return 'https://directus.alexlebens.net';
}; };
const getSiteURL = () => {
return 'https://www.alexlebens.dev';
};
async function getDirectusImageURL(image: string) { async function getDirectusImageURL(image: string) {
return `${getDirectusURL()}/assets/${image}`; return `${getDirectusURL()}/assets/${image}`;
} }
export { getDirectusURL, getDirectusImageURL }; export { getDirectusURL, getSiteURL, getDirectusImageURL };