diff --git a/.gitea/workflows/build-production.yaml b/.gitea/workflows/build-production.yaml index 84acd53..10151dc 100644 --- a/.gitea/workflows/build-production.yaml +++ b/.gitea/workflows/build-production.yaml @@ -22,7 +22,6 @@ jobs: run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo PROJECT_VERSION=$(npm pkg get version --workspaces=false | tr -d \") >> $GITHUB_OUTPUT build_and_push: runs-on: ubuntu-latest @@ -54,7 +53,6 @@ jobs: gitea.perren.cloud/caperren/caperren-com:latest build-args: | REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }} - PROJECT_VERSION=${{ needs.determine_version.outputs.project_version }} BUILD_ENVIRONMENT=production test: diff --git a/.gitea/workflows/build-staging.yaml b/.gitea/workflows/build-staging.yaml index a703610..4e1c396 100644 --- a/.gitea/workflows/build-staging.yaml +++ b/.gitea/workflows/build-staging.yaml @@ -22,7 +22,6 @@ jobs: run: | echo REPO_NAME=$(echo ${GITHUB_REPOSITORY} | awk -F"/" '{print $2}') >> $GITHUB_OUTPUT echo REPO_VERSION_HASH=$(git describe --tags --always | sed 's/^v//') >> $GITHUB_OUTPUT - echo PROJECT_VERSION=$(npm pkg get version --workspaces=false | tr -d \") >> $GITHUB_OUTPUT build_and_push: runs-on: ubuntu-latest @@ -52,7 +51,6 @@ jobs: gitea.perren.cloud/caperren/caperren-com:latest-staging build-args: | REPO_VERSION_HASH=${{ needs.determine_version.outputs.repo_version_hash }} - PROJECT_VERSION=${{ needs.determine_version.outputs.project_version }} BUILD_ENVIRONMENT=staging test: diff --git a/Dockerfile b/Dockerfile index 97263f1..ef4acca 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,23 +8,18 @@ COPY package.json package-lock.json tsconfig.json astro.config.mjs ./ FROM base AS prod-deps RUN npm install --omit=dev -FROM base AS build-deps -RUN npm install - -FROM build-deps AS build +FROM prod-deps AS build COPY . . ARG REPO_VERSION_HASH ARG BUILD_ENVIRONMENT -ARG PROJECT_VERSION RUN echo "PUBLIC_REPO_VERSION_HASH=\"${REPO_VERSION_HASH}\" \n\ - PUBLIC_BUILD_ENVIRONMENT=\"${BUILD_ENVIRONMENT}\" \n\ - PUBLIC_PROJECT_VERSION=\"${PROJECT_VERSION}\"" >> .env + PUBLIC_BUILD_ENVIRONMENT=\"${BUILD_ENVIRONMENT}\"" >> .env RUN npm run build -FROM httpd:latest AS runtime +FROM httpd:2.4 AS runtime WORKDIR /usr/local/apache2/htdocs RUN rm index.html diff --git a/src/components/Footer.astro b/src/components/Footer.astro index 47d76fa..9deacd6 100644 --- a/src/components/Footer.astro +++ b/src/components/Footer.astro @@ -3,5 +3,5 @@ diff --git a/src/env.d.ts b/src/env.d.ts index 47e19ac..dfec845 100644 --- a/src/env.d.ts +++ b/src/env.d.ts @@ -1,6 +1,5 @@ interface ImportMetaEnv { readonly PUBLIC_REPO_VERSION_HASH: string; - readonly PUBLIC_PROJECT_VERSION: string; readonly PUBLIC_BUILD_ENVIRONMENT: string; }