diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 5ca38a76c..dc3c1c2f4 100755 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -112,6 +112,7 @@ jobs: DEVISE_SECRET=${{ env.DEVISE_SECRET }} RAILS_ENV=production NODE_ENV=development + PLANO_VERSION_FROM_BUILD=${{ github.ref_name }} push: false load: true # target: development @@ -153,6 +154,7 @@ jobs: DEVISE_SECRET=${{ env.DEVISE_SECRET }} RAILS_ENV=production NODE_ENV=development + PLANO_VERSION_FROM_BUILD=${{ github.ref_name }} push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile-prod b/Dockerfile-prod index d1c8138fa..380453470 100644 --- a/Dockerfile-prod +++ b/Dockerfile-prod @@ -15,6 +15,12 @@ ENV BUNDLE_PATH /var/bundler ARG DEVISE_SECRET +# The build of the docker file will set the ARG PLANO_VERSION_FROM_BUILD +ARG PLANO_VERSION_FROM_BUILD +# And we set the ENV in the Docker container with a default value +# based on PLANO_VERSION_FROM_BUILD +ENV PLANO_VERSION=${PLANO_VERSION_FROM_BUILD} + RUN apk add \ build-base \ freetds-dev \ diff --git a/app/javascript/administration/about_link.vue b/app/javascript/administration/about_link.vue new file mode 100644 index 000000000..2d638d7c5 --- /dev/null +++ b/app/javascript/administration/about_link.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/app/javascript/navbar/top-navbar.vue b/app/javascript/navbar/top-navbar.vue index 59741027d..65741bf5d 100644 --- a/app/javascript/navbar/top-navbar.vue +++ b/app/javascript/navbar/top-navbar.vue @@ -8,7 +8,7 @@ - About + Logout @@ -22,6 +22,7 @@