From 38e330929f1aca314186008507d9ccb4c7d9394d Mon Sep 17 00:00:00 2001
From: Gail Terman <Gailbear@users.noreply.github.com>
Date: Thu, 4 Apr 2024 20:25:04 -0400
Subject: [PATCH 1/5] Update deploy.yml

---
 .github/workflows/deploy.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5ca38a76c..44e3765b7 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=${{ github.ref_name }}
           push: false
           load: true
           # target: development

From b0e60c04ad47516a6c73d614ad82aae2f5c5821b Mon Sep 17 00:00:00 2001
From: Gail Terman <gterman@gmail.com>
Date: Sun, 7 Apr 2024 18:43:45 -0400
Subject: [PATCH 2/5] actually commit things

---
 app/javascript/administration/about_link.vue | 29 +++++++
 app/javascript/navbar/top-navbar.vue         |  4 +-
 config/webpack/environment.js                |  3 +-
 deploy_script_attempt_1.sh                   | 18 +++++
 docker-compose-prod.yml                      |  1 +
 docker-compose-staging-prev.yml              | 82 ++++++++++++++++++++
 docker-compose-staging.yml                   |  5 +-
 7 files changed, 138 insertions(+), 4 deletions(-)
 create mode 100644 app/javascript/administration/about_link.vue
 create mode 100755 deploy_script_attempt_1.sh
 create mode 100644 docker-compose-staging-prev.yml

diff --git a/app/javascript/administration/about_link.vue b/app/javascript/administration/about_link.vue
new file mode 100644
index 000000000..4341af7d0
--- /dev/null
+++ b/app/javascript/administration/about_link.vue
@@ -0,0 +1,29 @@
+<template>
+  <div>
+    <b-button variant="link" class="text-light" v-b-modal.about-modal>About</b-button>
+    <b-modal id="about-modal" title="About" modal-class="about-modal" ok-only>
+      <p>Version: {{ PLANO_VERSION }}</p>
+      <p><a href="https://planoramaevents.github.io/planorama">About the Planorama Team &amp; Give Feedback</a></p>
+    </b-modal>
+  </div>
+</template>
+
+<script>
+import settingsMixin from "@/store/settings.mixin";
+
+export default {
+  name: "AboutLink",
+  mixins: [settingsMixin],
+  computed: {
+    email() {
+      return this.configByName('email_reply_to_address')
+    },
+  }
+}
+</script>
+
+<style lang="scss">
+.help-modal .modal-md{
+  max-width: 20rem;
+}
+</style>
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 @@
         <b-navbar-nav class="ml-auto">
           <b-nav-form>
             <help-link></help-link>
-            <a href="https://planoramaevents.github.io/planorama" target="_blank" class="btn btn-link text-light my-2 my-sm-0 mx-2">About</a>
+            <about-link></about-link>
             <b-button v-if="loggedIn" @click="logout" variant="primary">Logout</b-button>
           </b-nav-form>
         </b-navbar-nav>
@@ -22,6 +22,7 @@
 <script>
 import { settingsMixin } from '@/mixins';
 import HelpLink from '../administration/help_link.vue';
+import AboutLink from '../administration/about_link.vue';
 import authMixin from '../auth/auth.mixin';
 import personSessionMixin from '../auth/person_session.mixin';
 
@@ -29,6 +30,7 @@ export default {
   name: 'TopNavbar',
   components: {
     HelpLink,
+    AboutLink,
   },
   mixins: [
     authMixin,
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index 9ddae37cc..d9904b597 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -13,7 +13,8 @@ var path = require('path');
 
 environment.plugins.prepend('env',
   new webpack.DefinePlugin({
-    'NODE_ENV': JSON.stringify(process.env.NODE_ENV)
+    'NODE_ENV': JSON.stringify(process.env.NODE_ENV),
+    'PLANO_VERSION': JSON.stringify(process.env.PLANO_VERSION)
   })
 )
 
diff --git a/deploy_script_attempt_1.sh b/deploy_script_attempt_1.sh
new file mode 100755
index 000000000..45f43b485
--- /dev/null
+++ b/deploy_script_attempt_1.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/bash
+
+if [ $# -eq 0 ]; then
+    latest_tag=$(curl -s https://api.github.com/repos/PlanoramaEvents/planorama/releases/latest | jq -r '.tag_name')
+    export PLANO_VERSION=$latest_tag
+elif [ $# -eq 1 ] && [ "$1" == "staging" ]; then
+    staging_tag=$(curl -s https://api.github.com/repos/PlanoramaEvents/planorama/releases | jq -r '.[0].tag_name')
+    export PLANO_VERSION=$latest_tag
+elif [ $# -eq 1 ]; then
+    export PLANO_VERSION=$1
+else
+    echo "Usage: $0 [staging,VERSION NUMBER]"
+    exit 1
+fi
+
+echo "Plano version: $PLANO_VERSION"
+cd /opt/glasgow2024/app 
+/usr/bin/docker compose pull && /usr/bin/docker compose down && /usr/bin/docker compose up -d
diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml
index 1a226ef4d..46274c89c 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -40,6 +40,7 @@ services:
       - PUID=1001
       - RAILS_ENV=production
       - NODE_ENV=production
+      - PLANO_VERSION=${PLANO_VERSION}
     env_file:
       # NOTE: this will need to reflect local system
       - "/opt/plano/etc/planorama.env"
diff --git a/docker-compose-staging-prev.yml b/docker-compose-staging-prev.yml
new file mode 100644
index 000000000..dace91168
--- /dev/null
+++ b/docker-compose-staging-prev.yml
@@ -0,0 +1,82 @@
+#
+# This is sample docker file for use in a staging environment
+#
+# NOTE:
+# You will need to create the pgdata and redis-data volumes:
+#   docker volume create --name=pgdata
+#   docker volume create --name=redis-data
+#
+version: '3.7'
+
+volumes:
+  redis-data:
+    external: true
+  pgdata:
+    external: true
+
+services:
+  redis:
+    image: redis:alpine
+    restart: always
+    volumes:
+      - redis-data:/data
+
+  postgres:
+    image: postgres:12-alpine
+    restart: always
+    env_file:
+      # NOTE: this will need to reflect local system
+      - "/opt/plano/etc/planorama.env"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+  web:
+    command: "/opt/planorama/script/planorama_start.sh"
+    image: ghcr.io/planoramaevents/planorama:staging
+    ports:
+      - 3000:3000
+    volumes:
+      # NOTE: this will need to reflect local system
+      - /var/log/planorama/web:/opt/planorama/log
+      - type: tmpfs
+        target: /app/tmp
+      # NOTE: this will need to reflect local system
+      - /opt/plano/etc/planorama:/config
+    environment:
+      - PGID=1005
+      - PUID=1001
+      - RAILS_ENV=staging
+      - NODE_ENV=staging
+    env_file:
+      # NOTE: this will need to reflect local system
+      - "/opt/plano/etc/planorama.env"
+    depends_on:
+      - redis
+      - postgres
+    restart: always
+
+  planorama-sidekiq:
+    command: "/opt/planorama/script/planorama_sidekiq.sh"
+    image: ghcr.io/planoramaevents/planorama:staging
+    volumes:
+      # NOTE: this will need to reflect local system
+      - /var/log/planorama/sidekiq:/opt/planorama/log
+      - type: tmpfs
+        target: /app/tmp
+      # NOTE: this will need to reflect local system
+      - /opt/plano/etc/planorama:/config
+    environment:
+      - PGID=1005
+      - PUID=1001
+      - RAILS_ENV=staging
+      - NODE_ENV=staging
+    env_file:
+      # NOTE: this will need to reflect local system
+      - "/opt/plano/etc/planorama.env"
+    depends_on:
+      - redis
+    links:
+      - redis
+    restart: always
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index dace91168..37cbb7a51 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -34,7 +34,7 @@ services:
 
   web:
     command: "/opt/planorama/script/planorama_start.sh"
-    image: ghcr.io/planoramaevents/planorama:staging
+    image: ghcr.io/planoramaevents/planorama:${PLANO_VERSION}
     ports:
       - 3000:3000
     volumes:
@@ -49,6 +49,7 @@ services:
       - PUID=1001
       - RAILS_ENV=staging
       - NODE_ENV=staging
+      - PLANO_VERSION=${PLANO_VERSION}
     env_file:
       # NOTE: this will need to reflect local system
       - "/opt/plano/etc/planorama.env"
@@ -59,7 +60,7 @@ services:
 
   planorama-sidekiq:
     command: "/opt/planorama/script/planorama_sidekiq.sh"
-    image: ghcr.io/planoramaevents/planorama:staging
+    image: ghcr.io/planoramaevents/planorama:${PLANO_VERSION}
     volumes:
       # NOTE: this will need to reflect local system
       - /var/log/planorama/sidekiq:/opt/planorama/log

From 69549f2596137d973c827751a6d1ec4c245bb71e Mon Sep 17 00:00:00 2001
From: Henry <henry.balen@gmail.com>
Date: Fri, 12 Apr 2024 08:43:36 -0400
Subject: [PATCH 3/5] Get the git version at build time and insert into the
 docker image

---
 .github/workflows/deploy.yml | 3 ++-
 Dockerfile-prod              | 6 ++++++
 docker-compose-prod.yml      | 1 -
 docker-compose-staging.yml   | 5 ++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 44e3765b7..dc3c1c2f4 100755
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -112,7 +112,7 @@ jobs:
             DEVISE_SECRET=${{ env.DEVISE_SECRET }}
             RAILS_ENV=production
             NODE_ENV=development
-            PLANO_VERSION=${{ github.ref_name }}
+            PLANO_VERSION_FROM_BUILD=${{ github.ref_name }}
           push: false
           load: true
           # target: development
@@ -154,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/docker-compose-prod.yml b/docker-compose-prod.yml
index 46274c89c..1a226ef4d 100644
--- a/docker-compose-prod.yml
+++ b/docker-compose-prod.yml
@@ -40,7 +40,6 @@ services:
       - PUID=1001
       - RAILS_ENV=production
       - NODE_ENV=production
-      - PLANO_VERSION=${PLANO_VERSION}
     env_file:
       # NOTE: this will need to reflect local system
       - "/opt/plano/etc/planorama.env"
diff --git a/docker-compose-staging.yml b/docker-compose-staging.yml
index 37cbb7a51..dace91168 100644
--- a/docker-compose-staging.yml
+++ b/docker-compose-staging.yml
@@ -34,7 +34,7 @@ services:
 
   web:
     command: "/opt/planorama/script/planorama_start.sh"
-    image: ghcr.io/planoramaevents/planorama:${PLANO_VERSION}
+    image: ghcr.io/planoramaevents/planorama:staging
     ports:
       - 3000:3000
     volumes:
@@ -49,7 +49,6 @@ services:
       - PUID=1001
       - RAILS_ENV=staging
       - NODE_ENV=staging
-      - PLANO_VERSION=${PLANO_VERSION}
     env_file:
       # NOTE: this will need to reflect local system
       - "/opt/plano/etc/planorama.env"
@@ -60,7 +59,7 @@ services:
 
   planorama-sidekiq:
     command: "/opt/planorama/script/planorama_sidekiq.sh"
-    image: ghcr.io/planoramaevents/planorama:${PLANO_VERSION}
+    image: ghcr.io/planoramaevents/planorama:staging
     volumes:
       # NOTE: this will need to reflect local system
       - /var/log/planorama/sidekiq:/opt/planorama/log

From dc03d6e454ede2763355b0925ca86d556b54c2ec Mon Sep 17 00:00:00 2001
From: Henry <henry.balen@gmail.com>
Date: Fri, 12 Apr 2024 10:03:38 -0400
Subject: [PATCH 4/5] test env acces

---
 app/javascript/administration/about_link.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/administration/about_link.vue b/app/javascript/administration/about_link.vue
index 4341af7d0..7b4cc3aa6 100644
--- a/app/javascript/administration/about_link.vue
+++ b/app/javascript/administration/about_link.vue
@@ -2,7 +2,7 @@
   <div>
     <b-button variant="link" class="text-light" v-b-modal.about-modal>About</b-button>
     <b-modal id="about-modal" title="About" modal-class="about-modal" ok-only>
-      <p>Version: {{ PLANO_VERSION }}</p>
+      <p>Version: {{ process.env.PLANO_VERSION }}</p>
       <p><a href="https://planoramaevents.github.io/planorama">About the Planorama Team &amp; Give Feedback</a></p>
     </b-modal>
   </div>

From 7b924e2476cf49a77fb8d715bf5b930d9724364e Mon Sep 17 00:00:00 2001
From: Henry <henry.balen@gmail.com>
Date: Fri, 12 Apr 2024 10:20:53 -0400
Subject: [PATCH 5/5] Get version at runtime and not build time

---
 app/javascript/administration/about_link.vue | 8 +++++++-
 config/webpack/environment.js                | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/javascript/administration/about_link.vue b/app/javascript/administration/about_link.vue
index 7b4cc3aa6..2d638d7c5 100644
--- a/app/javascript/administration/about_link.vue
+++ b/app/javascript/administration/about_link.vue
@@ -2,7 +2,7 @@
   <div>
     <b-button variant="link" class="text-light" v-b-modal.about-modal>About</b-button>
     <b-modal id="about-modal" title="About" modal-class="about-modal" ok-only>
-      <p>Version: {{ process.env.PLANO_VERSION }}</p>
+      <p>Version: {{ version }}</p>
       <p><a href="https://planoramaevents.github.io/planorama">About the Planorama Team &amp; Give Feedback</a></p>
     </b-modal>
   </div>
@@ -18,6 +18,12 @@ export default {
     email() {
       return this.configByName('email_reply_to_address')
     },
+    // Get the version from the runtime ENV which is set in the
+    // local env OR docker file. For deployments it comes from the docker
+    // file
+    version() {
+      return process.env.PLANO_VERSION;
+    }
   }
 }
 </script>
diff --git a/config/webpack/environment.js b/config/webpack/environment.js
index d9904b597..9f91ca8d5 100644
--- a/config/webpack/environment.js
+++ b/config/webpack/environment.js
@@ -11,6 +11,7 @@ environment.loaders.prepend('erb', erb)
 
 var path = require('path');
 
+// NOTE: this is the build env
 environment.plugins.prepend('env',
   new webpack.DefinePlugin({
     'NODE_ENV': JSON.stringify(process.env.NODE_ENV),