Skip to content

Commit

Permalink
fix: use correct naming convention for public runtime config (#14)
Browse files Browse the repository at this point in the history
Co-authored-by: stefanprobst <stefanprobst@posteo.de>
  • Loading branch information
ctot-nondef and stefanprobst authored May 17, 2024
1 parent fdf141f commit e7ed43a
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 15 deletions.
2 changes: 1 addition & 1 deletion components/imprint.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const env = useRuntimeConfig();
const locale = useLocale();
const redmineId = env.public.NUXT_PUBLIC_REDMINE_ID;
const redmineId = env.public.redmineId;
const imprint = await useFetch(String(createImprintUrl(locale.value, redmineId)), {
responseType: "text",
Expand Down
11 changes: 4 additions & 7 deletions layouts/default.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ useHead({
property: "og:image",
content: String(
createUrl({
baseUrl: env.public.NUXT_PUBLIC_APP_BASE_URL,
baseUrl: env.public.appBaseUrl,
pathname: "/opengraph-image.png",
}),
),
Expand All @@ -68,17 +68,14 @@ useHead({
{ type: "application/ld+json", innerHTML: JSON.stringify(jsonLd, safeJsonLdReplacer) },
];
if (
isNonEmptyString(env.public.NUXT_PUBLIC_MATOMO_BASE_URL) &&
isNonEmptyString(env.public.NUXT_PUBLIC_MATOMO_ID)
) {
const baseUrl = env.public.NUXT_PUBLIC_MATOMO_BASE_URL;
if (isNonEmptyString(env.public.matomoBaseUrl) && isNonEmptyString(env.public.matomoId)) {
const baseUrl = env.public.matomoBaseUrl;
scripts.push({
type: "",
innerHTML: createAnalyticsScript(
baseUrl.endsWith("/") ? baseUrl : baseUrl + "/",
env.public.NUXT_PUBLIC_MATOMO_ID,
env.public.matomoId,
),
});
}
Expand Down
10 changes: 5 additions & 5 deletions nuxt.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ export default defineNuxtConfig({
runtimeConfig: {
NODE_ENV: process.env.NODE_ENV,
public: {
NUXT_PUBLIC_APP_BASE_URL: process.env.NUXT_PUBLIC_APP_BASE_URL,
NUXT_PUBLIC_BOTS: process.env.NUXT_PUBLIC_BOTS,
NUXT_PUBLIC_MATOMO_BASE_URL: process.env.NUXT_PUBLIC_MATOMO_BASE_URL,
NUXT_PUBLIC_MATOMO_ID: process.env.NUXT_PUBLIC_MATOMO_ID,
NUXT_PUBLIC_REDMINE_ID: process.env.NUXT_PUBLIC_REDMINE_ID,
appBaseUrl: process.env.NUXT_PUBLIC_APP_BASE_URL,
bots: process.env.NUXT_PUBLIC_BOTS,
matomoBaseUrl: process.env.NUXT_PUBLIC_MATOMO_BASE_URL,
matomoId: process.env.NUXT_PUBLIC_MATOMO_ID,
redmineId: process.env.NUXT_PUBLIC_REDMINE_ID,
},
},
typescript: {
Expand Down
11 changes: 9 additions & 2 deletions readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,22 @@ pnpm run dev
and set the `SERVICE_ID` github variable to the issue number. this should match the
`NUXT_PUBLIC_REDMINE_ID` variable in your `.env.local` file.
- ensure required build args (prefixed with `NUXT_PUBLIC_`) are referenced in both the
[`Dockerfle`](./Dockerfile), as well as the [validation](./.github/workflows/validate.yml) as
[`Dockerfile`](./Dockerfile), as well as the [validation](./.github/workflows/validate.yml) and
[deployment](./.github/workflows/build-deploy.yml) pipelines, and set as github variables.
- ensure required runtime environment variables are referenced in the
[validation](./.github/workflows/validate.yml) and
[deployment](./.github/workflows/build-deploy.yml) pipelines, and set as github secrets. github
secrets need to be prefixed with `K8S_SECRET_` to be automatically copied to the runtime
environment. in case you need secrets in the docker build context, you can
[mount a secret in the Dockerfile](https://docs.docker.com/build/building/secrets/).
- ensure both the github repository, as well as the
- To enable runtime override of public `runtimeConfig` build values through runtime env vars note
the
[naming conventions](https://nuxt.com/docs/guide/going-further/runtime-config#environment-variables)

> [!IMPORTANT] This is a feature exclusive to nuxt 3. For most deployment scenarios it is not
> needed, but it can be useful for deploying multiple instances from a single build.
- ensure both the github repository, and the
[package registry](https://github.com/orgs/acdh-oeaw/packages/container/my-app/settings) is set to
public.

Expand Down

0 comments on commit e7ed43a

Please sign in to comment.