Switch to cp command & one Dockerfile

Author: Munkkeli

.diploi/helm/app.yaml

@@ -53,6 +53,8 @@ spec:
             {{- if eq .Values.stage "development" }}
             - name: paths__contentPath
               value: /app/{{ .Values.identifier }}
+            - name: NODE_ENV
+              value: development
             {{- end }}
             - name: url
               value: https://{{ .Values.hosts.app }}

Dockerfile

@@ -4,11 +4,10 @@ ARG FOLDER=/app
 FROM ghost:alpine
 
 COPY --chown=1000:1000 . /app
-COPY --chown=1000:1000 ./adapters/DiploiFilesStorage.j[s] /var/lib/ghost/versions/$GHOST_VERSION/core/server/adapters/storage/
-COPY --chown=1000:1000 ./adapters/DiploiImagesStorage.j[s] /var/lib/ghost/versions/$GHOST_VERSION/core/server/adapters/storage/
-COPY --chown=1000:1000 ./adapters/DiploiMediaStorage.j[s] /var/lib/ghost/versions/$GHOST_VERSION/core/server/adapters/storage/
 
-ENV NODE_ENV=production
+# Copy Diploi storage adapters to the Ghost core
+RUN cp ${FOLDER}/adapters/Diploi*Storage.js /var/lib/ghost/versions/$GHOST_VERSION/core/server/adapters/storage/
+
 ENV paths__contentPath=${FOLDER}
 
 USER 1000:1000

Dockerfile.dev

@@ -1,6 +1,6 @@
 // # Local File System Storage module
 // The (default) module for storing media, modified to use the Diploi volume mount /data
-// This file will be moved to the /core/server/adapters/storage folder by the Dockerfiles.
+// This file will be moved to the /core/server/adapters/storage folder by the Dockerfile.
 const config = require('../../../shared/config');
 const LocalStorageBase = require('./LocalStorageBase');
 

adapters/DiploiFilesStorage.js

@@ -1,6 +1,6 @@
 // # Local File System Image Storage module
 // The (default) module for storing images, modified to use the Diploi volume mount /data
-// This file will be moved to the /core/server/adapters/storage folder by the Dockerfiles.
+// This file will be moved to the /core/server/adapters/storage folder by the Dockerfile.
 const config = require('../../../shared/config');
 const urlUtils = require('../../../shared/url-utils');
 const LocalStorageBase = require('./LocalStorageBase');

adapters/DiploiImagesStorage.js

@@ -1,6 +1,6 @@
 // # Local File System Media Storage module
 // The (default) module for storing media, modified to use the Diploi volume mount /data
-// This file will be moved to the /core/server/adapters/storage folder by the Dockerfiles.
+// This file will be moved to the /core/server/adapters/storage folder by the Dockerfile.
 const config = require('../../../shared/config');
 const LocalStorageBase = require('./LocalStorageBase');