diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 6ded378..b6d0171 100755 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -22,7 +22,7 @@ jobs: - name: Build & Tag Image run: | - docker build -t git.altaiar.dev/${{ gitea.repository }}:${{ gitea.ref_name }} . + docker build --build-arg APP_VERSION=${{ gitea.ref_name }} -t git.altaiar.dev/${{ gitea.repository }}:${{ gitea.ref_name }} . docker tag git.altaiar.dev/${{ gitea.repository }}:${{ gitea.ref_name }} git.altaiar.dev/${{ gitea.repository }}:latest - name: Push Images diff --git a/Dockerfile b/Dockerfile index dc52011..f91e5ce 100755 --- a/Dockerfile +++ b/Dockerfile @@ -67,6 +67,7 @@ ARG CITY ARG DEFAULT_THEME ARG API_ADDRESS_PROD ARG API_ADDRESS_DEV +ARG APP_VERSION COPY --chown=node:node web web RUN yarn rw build web @@ -83,6 +84,7 @@ ARG CITY ARG DEFAULT_THEME ARG API_ADDRESS_PROD ARG API_ADDRESS_DEV +ARG APP_VERSION COPY --chown=node:node web web RUN yarn rw build web --no-prerender @@ -157,7 +159,8 @@ COPY --chown=node:node graphql.config.js . COPY --chown=node:node --from=web_build /home/node/app/web/dist /home/node/app/web/dist ENV NODE_ENV=production \ - API_PROXY_TARGET=http://api:8911 + API_PROXY_TARGET=http://api:8911 \ + APP_VERSION=${APP_VERSION} # We use the shell form here for variable expansion. CMD "node_modules/.bin/rw-web-server" "--api-proxy-target" "$API_PROXY_TARGET" diff --git a/redwood.toml b/redwood.toml index d20a76d..5604727 100755 --- a/redwood.toml +++ b/redwood.toml @@ -9,7 +9,7 @@ title = "${FIRST_NAME} ${LAST_NAME}" port = 8910 apiUrl = "/api" - includeEnvironmentVariables = ["FIRST_NAME", "LAST_NAME", "COUNTRY", "STATE", "CITY", "DEFAULT_THEME", "API_ADDRESS_PROD", "API_ADDRESS_DEV"] + includeEnvironmentVariables = ["FIRST_NAME", "LAST_NAME", "COUNTRY", "STATE", "CITY", "DEFAULT_THEME", "API_ADDRESS_PROD", "API_ADDRESS_DEV", "APP_VERSION"] [generate] tests = false stories = false diff --git a/web/src/pages/HomePage/HomePage.tsx b/web/src/pages/HomePage/HomePage.tsx index 5140edf..6532206 100755 --- a/web/src/pages/HomePage/HomePage.tsx +++ b/web/src/pages/HomePage/HomePage.tsx @@ -65,14 +65,23 @@ const HomePage = () => (
- - {getLogoComponent('gitea')} - + 0 + ? `https://git.altaiar.dev/ahmed/portfolio/releases/tag/${process.env.APP_VERSION}` + : 'https://git.altaiar.dev/ahmed/portfolio' + } + target="_blank" + rel="noreferrer" + className="btn btn-square" + > + {getLogoComponent('gitea')} + +
)