From 90c9648abab5a4c92cfc0d61b540e2e33b6f2a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?=
 <fedramp_admin@collaboration.ai>
Date: Fri, 23 Apr 2021 00:30:20 -0400
Subject: [PATCH 1/2] Upgrades and styling

---
 Dockerfile              |  5 ++++-
 config/php.ini          |  2 +-
 hardening_manifest.yaml | 13 +++++++++----
 scripts/decrypt.sh      |  6 ++++++
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b60698b..548960a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,6 @@ ARG BASE_TAG=8.3
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
-ARG VERSION=21.13
 #COPY LICENSE /licenses/innosabi
 
 RUN \
@@ -87,6 +86,10 @@ COPY appserver.tar.gz.aes.tar.gz /tmp/appserver.tar.gz.aes.tar.gz
 RUN cd /tmp && tar -zxvf appserver.tar.gz.aes.tar.gz && rm appserver.tar.gz.aes.tar.gz
 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
+
 RUN mv /tmp/composer.lock /opt/ignite
 RUN mv /tmp/composer.json /opt/ignite
 
diff --git a/config/php.ini b/config/php.ini
index 090a06c..9dda455 100644
--- a/config/php.ini
+++ b/config/php.ini
@@ -34,5 +34,5 @@ opcache.enable=1
 opcache.memory_consumption=512
 opcache.interned_strings_buffer=32
 opcache.max_accelerated_files=100000
-opcache.validate_timestamps=0
+opcache.validate_timestamps=${OPCACHE_VALIDATE_TIMESTAMPS}
 opcache.blacklist_filename=/storage/instances
diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index e1a3866..5987be1 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.13"
+- "21.16"
 - "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.13"
+  org.opencontainers.image.version: "21.16"
   ## Keywords to help with search (ex. "cicd,gitops,golang")
   mil.dso.ironbank.image.keywords: "CrowdVector"
   ## This value can be "opensource" or "commercial"
@@ -182,11 +182,16 @@ resources:
     validation:
       type: "sha256" 
       value: "8246d152767da7e6dd297599ed4c55b8bde2a5c18e54d97a80d44eb3099d6e89" 
-  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.13.tar.gz.aes.tar.gz"
+  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/navyspark.tar.gz"
+    filename: "navyspark.tar.gz"
+    validation:
+      type: "sha256"
+      value: "63c0394d52c448b426c304aa063626890e4bf4197a9e211e296bd1db842c7e46"
+  - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.16.tar.gz.aes.tar.gz"
     filename: "appserver.tar.gz.aes.tar.gz"
     validation:
       type: "sha256" 
-      value: "6c9bfeb89ec49580900811d27b9d0fdd9b2238abdd614fcc75d7ffba1642b268"
+      value: "befbe9f8199286b8e5e32d908c8eeaa1f179a6154e7696839203dd3a556043f1"
 
 # List of project maintainers
 maintainers:
diff --git a/scripts/decrypt.sh b/scripts/decrypt.sh
index de00e2a..ec6aced 100755
--- a/scripts/decrypt.sh
+++ b/scripts/decrypt.sh
@@ -14,6 +14,12 @@ if [ -f "appserver.tar.gz.aes" ]; then
 
   # Remove duplicate package files
   rm composer.json composer.lock
+
+  # Unpack navyspark styling
+  if [ ! -d "/storage/instances/navyspark" ]; then
+    mkdir -p /storage/instances
+    cp -r /tmp/navyspark /storage/instances/navyspark
+  fi
 fi
 
 cd $path
-- 
GitLab


From 78775a74d4f093271d6c219ea0b7c2e2701b1037 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Ccrowdvector=E2=80=9D?=
 <fedramp_admin@collaboration.ai>
Date: Fri, 23 Apr 2021 11:46:26 -0400
Subject: [PATCH 2/2] fixed file ownership in styling

---
 hardening_manifest.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hardening_manifest.yaml b/hardening_manifest.yaml
index 5987be1..e44d336 100644
--- a/hardening_manifest.yaml
+++ b/hardening_manifest.yaml
@@ -186,7 +186,7 @@ resources:
     filename: "navyspark.tar.gz"
     validation:
       type: "sha256"
-      value: "63c0394d52c448b426c304aa063626890e4bf4197a9e211e296bd1db842c7e46"
+      value: "4a8a2ad892806add76befc6f1fcc62230efeb3700fdda293bb4de948ab3d04ab"
   - url: "https://gitlab.com/crowdvector/dist/-/raw/feature/distribution/docker/appserver/appserver-21.16.tar.gz.aes.tar.gz"
     filename: "appserver.tar.gz.aes.tar.gz"
     validation:
-- 
GitLab