From 60bbfbe72b99bf40a8d2e47ca47c5596fe6a7892 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?=
 <fedramp_admin@collaboration.ai>
Date: Fri, 9 Jul 2021 14:11:18 -0400
Subject: [PATCH 1/2] bug fixes

---
 Dockerfile              |  6 ++++--
 hardening_manifest.yaml | 15 ++++++++++-----
 scripts/decrypt.sh      |  8 +++++++-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fb1af3d..742b772 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -87,8 +87,10 @@ RUN cd /tmp && tar -zxvf appserver.tar.gz.aes.tar.gz && rm appserver.tar.gz.aes.
 RUN mv /tmp/appserver.tar.gz.aes /opt/ignite
 
 # Copy styling information
-COPY navyspark.tar.gz /tmp/navyspark.tar.gz
-RUN cd /tmp && tar -zxvf navyspark.tar.gz && rm navyspark.tar.gz
+COPY navyspark.tar.gz /opt/navyspark.tar.gz
+RUN cd /opt && tar -zxvf navyspark.tar.gz && rm navyspark.tar.gz
+COPY airforcespark.tar.gz /opt/airforcespark.tar.gz
+RUN cd /opt && tar -zxvf airforcespark.tar.gz && rm airforcespark.tar.gz
 
 RUN mv /tmp/composer.lock /opt/ignite
 RUN mv /tmp/composer.json /opt/ignite
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 31f221e..6b19a22 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -8,7 +8,7 @@ name: "collaborationai/crowd-vector/appserver"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "21.25"
+- "21.27"
 - "latest"
 
 # Build args passed to Dockerfile ARGs
@@ -27,7 +27,7 @@ labels:
   org.opencontainers.image.url: "https://collaboration.ai/products/crowdvector/"
   ## Name of the distributing entity, organization or individual
   org.opencontainers.image.vendor: "Collaboration.Ai"
-  org.opencontainers.image.version: "21.25"
+  org.opencontainers.image.version: "21.27"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "CrowdVector"
   ## This value can be "opensource" or "commercial"
@@ -186,12 +186,17 @@ resources:
     filename: "navyspark.tar.gz"
     validation:
       type: "sha256"
-      value: "4a8a2ad892806add76befc6f1fcc62230efeb3700fdda293bb4de948ab3d04ab"
-  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.25.tar.gz.aes.tar.gz"
+      value: "f6e0e03c9533e9bfd44102c528140262c2664413931fdb17a80e629339370abc"
+  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/airforcespark.tar.gz"
+    filename: "airforcespark.tar.gz"
+    validation:
+      type: "sha256"
+      value: "7bbf9b76f7792d1339319adcf0b1bf409e3f256b24165e578a46e0f88be2f0e2"
+  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.27.tar.gz.aes.tar.gz"
     filename: "appserver.tar.gz.aes.tar.gz"
     validation:
       type: "sha256" 
-      value: "86588b40d5b815771d5c51d652b926bc0af01a8b644d13cc65e8f1f100594d89"
+      value: "15684278946c2da7bc76c16ff199bd155af8c900f3beb201f362667565169c54"
 
 # List of project maintainers
 maintainers:
diff --git a/scripts/decrypt.sh b/scripts/decrypt.sh
index ec6aced..ebfe8fa 100755
--- a/scripts/decrypt.sh
+++ b/scripts/decrypt.sh
@@ -18,7 +18,13 @@ if [ -f "appserver.tar.gz.aes" ]; then
   # Unpack navyspark styling
   if [ ! -d "/storage/instances/navyspark" ]; then
     mkdir -p /storage/instances
-    cp -r /tmp/navyspark /storage/instances/navyspark
+    cp -r /opt/navyspark /storage/instances/navyspark
+  fi
+
+  # Unpack airforcespark styling
+  if [ ! -d "/storage/instances/airforcespark" ]; then
+    mkdir -p /storage/instances
+    cp -r /opt/airforcespark /storage/instances/airforcespark
   fi
 fi
 
-- 
GitLab


From 51f03480a597f781ce8709c0d3db4184cf4865f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?=
 <fedramp_admin@collaboration.ai>
Date: Fri, 9 Jul 2021 15:08:30 -0400
Subject: [PATCH 2/2] changing checksum for styling files

---
 hardening_manifest.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 6b19a22..2785503 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -186,12 +186,12 @@ resources:
     filename: "navyspark.tar.gz"
     validation:
       type: "sha256"
-      value: "f6e0e03c9533e9bfd44102c528140262c2664413931fdb17a80e629339370abc"
+      value: "552c87872c63380ab4c71944488fb381e7f4d20e1b36e1d036993f05ae265545"
   - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/airforcespark.tar.gz"
     filename: "airforcespark.tar.gz"
     validation:
       type: "sha256"
-      value: "7bbf9b76f7792d1339319adcf0b1bf409e3f256b24165e578a46e0f88be2f0e2"
+      value: "e4ee32f1f26ebfabe9229757ad591286241d6403f42125c5ef60714b032cc725"
   - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.27.tar.gz.aes.tar.gz"
     filename: "appserver.tar.gz.aes.tar.gz"
     validation:
-- 
GitLab