fix #29

Dockerfile

@@ -116,7 +116,7 @@ RUN chmod +x \
     /var/scripts/observe.sh \
     /var/scripts/sync.sh
 
-RUN mkdir -p _assets images \
+RUN mkdir -p images/_assets \
     importing/no-parse \
     importing/parse-albums \
     importing/parse-users

Makefile

@@ -63,7 +63,6 @@ feedback--url:
 
 feedback--volumes:
 	@echo "${PROJECT}_database"
-	@echo "${PROJECT}_assets"
 	@echo "${PROJECT}_storage"
 
 # Docker

default.yml

@@ -23,7 +23,6 @@ services:
       - nginx-proxy
     volumes:
       - storage:/var/www/html/images/
-      - assets:/var/www/html/_assets/
       - type: bind
         source: ${PWD}/.well-known
         target: /var/www/html/.well-known
@@ -48,13 +47,12 @@ services:
       CHEVERETO_HOSTNAME_PATH: ${HOSTNAME_PATH}
       CHEVERETO_HTTPS: ${HTTPS}
       CHEVERETO_ASSET_STORAGE_TYPE: local
-      CHEVERETO_ASSET_STORAGE_URL: ${URL}_assets/
-      CHEVERETO_ASSET_STORAGE_BUCKET: /var/www/html/_assets/
+      CHEVERETO_ASSET_STORAGE_URL: ${URL}images/_assets/
+      CHEVERETO_ASSET_STORAGE_BUCKET: /var/www/html/images/_assets/
       CHEVERETO_ENCRYPTION_KEY: yUwfiRh6anwqC/sIx3COCIZeMT9rxdbXkMDdfgyrM2M=
 
 volumes:
   database:
-  assets:
   storage:
 
 networks:

dev.yml

@@ -22,7 +22,6 @@ services:
       - chevereto
     volumes:
       - storage:/var/www/html/images/
-      - assets:/var/www/html/_assets/
       - chevereto:/var/www/html/
       - type: bind
         source: ${SOURCE}
@@ -51,8 +50,8 @@ services:
       CHEVERETO_HOSTNAME_PATH: ${HOSTNAME_PATH}
       CHEVERETO_HTTPS: ${HTTPS}
       CHEVERETO_ASSET_STORAGE_TYPE: local
-      CHEVERETO_ASSET_STORAGE_URL: ${URL}_assets/
-      CHEVERETO_ASSET_STORAGE_BUCKET: /var/www/html/_assets/
+      CHEVERETO_ASSET_STORAGE_URL: ${URL}images/_assets/
+      CHEVERETO_ASSET_STORAGE_BUCKET: /var/www/html/images/_assets/
       CHEVERETO_ENCRYPTION_KEY: yUwfiRh6anwqC/sIx3COCIZeMT9rxdbXkMDdfgyrM2M=
 
 volumes:

docs/PERSISTENT.md

@@ -16,7 +16,7 @@ If you are using volumes for persistent storage, permissions in the mount path m
 Run this command in the Chevereto container to set the right permissions:
 
 ```sh
-/bin/bash -c 'chown -R www-data: _assets/ images/ importing/'
+/bin/bash -c 'chown -R www-data: images/ importing/'
 ```
 
 ## Permissions check
@@ -31,7 +31,6 @@ drwxr-xr-x  1 root     root     4096 Mar 29 01:50 ..
 -rw-r--r--  1 www-data www-data    0 Aug  2  2021 .gitkeep
 -rw-r--r--  1 www-data www-data 1342 Mar 21 20:26 .htaccess
 -rw-r--r--  1 www-data www-data 6009 Mar 21 20:26 LICENSE
-drwxr-xr-x  2 root     root     4096 Apr  1 18:52 _assets
 drwxr-xr-x 11 www-data www-data 4096 Apr  1 18:55 app
 drwxr-xr-x  5 www-data www-data 4096 Apr  1 18:56 content
 drwxr-xr-x  3 www-data www-data 4096 Apr  1 18:53 images
@@ -42,11 +41,10 @@ drwxr-xr-x  2 www-data www-data 4096 Apr  1 18:56 sdk
 
 ## Volume reference
 
-| Volume                  | Mount path             | Purpose                              |
-| ----------------------- | ---------------------- | ------------------------------------ |
-| [chevereto](#chevereto) | /var/www/html/         | Chevereto application files          |
-| [storage](#storage)     | /var/www/html/images/  | User uploads                         |
-| [assets](#assets)       | /var/www/html/_assets/ | Website assets (avatars, logos, etc) |
+| Volume                  | Mount path            | Purpose                                     |
+| ----------------------- | --------------------- | ------------------------------------------- |
+| [chevereto](#chevereto) | /var/www/html/        | Chevereto application files                 |
+| [storage](#storage)     | /var/www/html/images/ | User uploads + assets (avatars, logos, etc) |
 
 ### Chevereto
 
@@ -56,16 +54,10 @@ This volume is for storing the application files shared between containers `php`
 
 ### Storage
 
-This volume is for storing user uploaded images.
+This volume is for storing user uploaded images and assets namely user avatars, website logos, background images, etc.
 
 👉 This is used when you don't add any External Storage provider to Chevereto.
 
-### Assets
-
-This volume is used for storing Chevereto assets namely user avatars, website logos, background images, etc.
-
-👉 This is used when you configure asset storage for use the `local` External Storage API.
-
 ## Troubleshoot
 
 ### No persistence
@@ -84,7 +76,6 @@ For example:
 
 ```sh
 make volume-cp VOLUME_FROM=local_chevereto-build_database VOLUME_TO=chevereto_chevereto_database
-make volume-cp VOLUME_FROM=local_chevereto-build_assets VOLUME_TO=chevereto_chevereto_assets
 make volume-cp VOLUME_FROM=local_chevereto-build_storage VOLUME_TO=chevereto_chevereto_storage
 ```
 
@@ -98,6 +89,5 @@ If everything went well the system will reflect the existing persistance layer,
 
 ```sh
 make volume-rm local_chevereto-build_database
-make volume-rm local_chevereto-build_assets
 make volume-rm local_chevereto-build_storage
 ```

scripts/sync.sh

@@ -12,7 +12,6 @@ function sync() {
         --filter=':- .gitignore' \
         --exclude '.git' \
         --exclude '.well-known' \
-        --exclude '_assets/' \
         --delete \
         $SOURCE $TARGET
 }