From 1cae67023f8ac3de78a9b64ce8aabfbc8eb49d55 Mon Sep 17 00:00:00 2001
From: Firq <me@firq.dev>
Date: Tue, 15 Apr 2025 22:02:01 +0200
Subject: [PATCH] Added version output
---
.forgejo/workflows/build_preview.yml | 2 ++
.forgejo/workflows/build_release.yml | 2 ++
Dockerfile | 4 +++-
Dockerfile.reports | 3 ++-
astro.config.mjs | 2 +-
package-lock.json | 4 ++--
package.json | 2 +-
7 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/.forgejo/workflows/build_preview.yml b/.forgejo/workflows/build_preview.yml
index c9ab2ce..14d4187 100644
--- a/.forgejo/workflows/build_preview.yml
+++ b/.forgejo/workflows/build_preview.yml
@@ -51,6 +51,8 @@ jobs:
with:
push: true
tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:preview
+ build-args: |
+ version=${{ github.ref_name }}
create-release:
needs: [ build-site ]
diff --git a/.forgejo/workflows/build_release.yml b/.forgejo/workflows/build_release.yml
index cff1c16..2479bd5 100644
--- a/.forgejo/workflows/build_release.yml
+++ b/.forgejo/workflows/build_release.yml
@@ -51,6 +51,8 @@ jobs:
with:
push: true
tags: forgejo.neshweb.net/firq/firq-dev-website:${{ github.ref_name }}, forgejo.neshweb.net/firq/firq-dev-website:latest
+ build-args: |
+ version=${{ github.ref_name }}
auto-deploy-dockge:
needs: [ build-site ]
diff --git a/Dockerfile b/Dockerfile
index 965a1e4..21af423 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,10 +10,12 @@ RUN npm run build
RUN rm ./dist/.original.favicon.ico
FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
+ARG version
+ENV version=0.0.1
WORKDIR /
COPY --from=build /app/dist /public
COPY --from=build /app/serve.json /public/serve.json
EXPOSE 8081
-CMD serve --listen 8081 --no-clipboard /public
+CMD echo $version; serve --listen 8081 --no-clipboard /public
diff --git a/Dockerfile.reports b/Dockerfile.reports
index dff9bce..77d76be 100644
--- a/Dockerfile.reports
+++ b/Dockerfile.reports
@@ -3,7 +3,8 @@ FROM forgejo.neshweb.net/ci-docker-images/website-serve:2 AS runtime
ARG version
ENV version=0.0.1
+WORKDIR /
ADD reports /public
EXPOSE 8081
-CMD echo $version && serve --listen 8081 --no-clipboard /public
+CMD echo $version; serve --listen 8081 --no-clipboard /public
diff --git a/astro.config.mjs b/astro.config.mjs
index b6bb02e..97da7aa 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -11,5 +11,5 @@ export default defineConfig({
outDir: 'dist',
publicDir: 'public',
site: 'https://firq.dev/',
- integrations: [sitemap(), mdx(), astroMetaTags(), criticalCss()]
+ integrations: [sitemap(), mdx(), astroMetaTags(), criticalCss()],
});
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index d7d6672..0e3b4ad 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
{
"name": "@firq/fgosite",
- "version": "0.2.0-pre.97",
+ "version": "0.2.0-pre.98",
"lockfileVersion": 3,
"requires": true,
"packages": {
"": {
"name": "@firq/fgosite",
- "version": "0.2.0-pre.97",
+ "version": "0.2.0-pre.98",
"dependencies": {
"@astro-community/astro-embed-youtube": "^0.5.6",
"@astrojs/check": "^0.9.4",
diff --git a/package.json b/package.json
index 0c16209..1f57c89 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "@firq/fgosite",
"type": "module",
- "version": "0.2.0-pre.97",
+ "version": "0.2.0-pre.98",
"private": true,
"scripts": {
"dev": "astro dev",