From b9b5736e5efb57b31b61d4af0b0a774b3c83b40e Mon Sep 17 00:00:00 2001 From: Philipp Kunz Date: Thu, 26 Dec 2024 14:48:07 +0100 Subject: [PATCH] fix(assets): Correct URLs in templates and fix TypeScript declaration --- .../ci_docker/.gitea/workflows/docker_nottags.yaml | 2 +- assets/templates/dockerfile_service/Dockerfile | 8 ++++---- assets/templates/website/ts_web/elements/header.ts | 2 +- changelog.md | 6 ++++++ ts/00_commitinfo_data.ts | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml b/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml index 5b39300..f361f62 100644 --- a/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml +++ b/assets/templates/ci_docker/.gitea/workflows/docker_nottags.yaml @@ -7,7 +7,7 @@ on: env: IMAGE: code.foss.global/hosttoday/ht-docker-node:npmci - NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{gi.host}}/${-{gitea.repository}-}.git + NPMCI_COMPUTED_REPOURL: https://${-{gitea.repository_owner}-}:${-{secrets.GITEA_TOKEN}-}@{{git.host}}/${-{gitea.repository}-}.git NPMCI_TOKEN_NPM: ${-{secrets.NPMCI_TOKEN_NPM}-} NPMCI_TOKEN_NPM2: ${-{secrets.NPMCI_TOKEN_NPM2}-} NPMCI_GIT_GITHUBTOKEN: ${-{secrets.NPMCI_GIT_GITHUBTOKEN}-} diff --git a/assets/templates/dockerfile_service/Dockerfile b/assets/templates/dockerfile_service/Dockerfile index b8dec57..472ae2f 100644 --- a/assets/templates/dockerfile_service/Dockerfile +++ b/assets/templates/dockerfile_service/Dockerfile @@ -1,6 +1,6 @@ # gitzone dockerfile_service ## STAGE 1 // BUILD -FROM code.foss.global/hosttoday/ht-docker-node:npmci as node1 +FROM code.foss.global/host.today/ht-docker-node:npmci as node1 COPY ./ /app WORKDIR /app ARG NPMCI_TOKEN_NPM2 @@ -12,7 +12,7 @@ RUN pnpm run build # gitzone dockerfile_service ## STAGE 2 // install production -FROM code.foss.global/hosttoday/ht-docker-node:npmci as node2 +FROM code.foss.global/host.today/ht-docker-node:npmci as node2 WORKDIR /app COPY --from=node1 /app /app RUN rm -rf .pnpm-store @@ -24,7 +24,7 @@ RUN rm -rf node_modules/ && pnpm install --prod ## STAGE 3 // rebuild dependencies for alpine -FROM code.foss.global/hosttoday/ht-docker-node:alpinenpmci as node3 +FROM code.foss.global/host.today/ht-docker-node:alpinenpmci as node3 WORKDIR /app COPY --from=node2 /app /app ARG NPMCI_TOKEN_NPM2 @@ -34,7 +34,7 @@ RUN pnpm config set store-dir .pnpm-store RUN pnpm rebuild -r ## STAGE 4 // the final production image with all dependencies in place -FROM code.foss.global/hosttoday/ht-docker-node:alpine as node4 +FROM code.foss.global/host.today/ht-docker-node:alpine as node4 WORKDIR /app COPY --from=node3 /app /app diff --git a/assets/templates/website/ts_web/elements/header.ts b/assets/templates/website/ts_web/elements/header.ts index 330d69b..3a28d80 100644 --- a/assets/templates/website/ts_web/elements/header.ts +++ b/assets/templates/website/ts_web/elements/header.ts @@ -6,7 +6,7 @@ import { cssManager, unsafeCSS, css, - TemplateResult, + type TemplateResult, } from '@design.estate/dees-element'; @customElement('default-header') diff --git a/changelog.md b/changelog.md index ffd04b4..f847d4d 100644 --- a/changelog.md +++ b/changelog.md @@ -1,5 +1,11 @@ # Changelog +## 2024-12-26 - 1.10.7 - fix(assets) +Correct URLs in templates and fix TypeScript declaration + +- Updated incorrect URLs in Dockerfile templates to 'host.today'. +- Fixed type declaration for 'TemplateResult' in header.ts file. + ## 2024-12-08 - 1.10.6 - fix(ci) Corrected Docker image URL in CI templates diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index c2ab0ab..4f857ac 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@git.zone/cli', - version: '1.10.6', + version: '1.10.7', description: 'A CLI toolbelt to streamline local development cycles by using various gitzone utilities.' }