From 381d271f96ab805dc308e188313bee03f47556cc Mon Sep 17 00:00:00 2001 From: Dale Davies Date: Fri, 4 Feb 2022 10:47:59 +0000 Subject: [PATCH] Renamed web directory to jumpapp --- Dockerfile | 6 +++--- .../assets/backgrounds/animal-g3298dcb04_1920.jpg | Bin .../assets/backgrounds/budapest-g056b86516_1920.jpg | Bin .../assets/backgrounds/building-gad730b330_1920.jpg | Bin .../assets/backgrounds/nature-gbde25f3ce_1920.jpg | Bin .../backgrounds/san-francisco-g1a7f2aef8_1920.jpg | Bin .../assets/backgrounds/sea-ga4cb2ef0b_1920.jpg | Bin .../assets/backgrounds/seagull-gc0701fe2f_1920.jpg | Bin {web => jumpapp}/assets/css/styles.css | 0 {web => jumpapp}/assets/images/default-icon.png | Bin {web => jumpapp}/assets/images/overlay.png | Bin {web => jumpapp}/assets/js/index.js | 0 {web => jumpapp}/background-css.php | 0 {web => jumpapp}/classes/Background.php | 0 {web => jumpapp}/classes/Cache.php | 0 {web => jumpapp}/classes/Config.php | 0 {web => jumpapp}/classes/Greeting.php | 0 {web => jumpapp}/classes/Main.php | 0 {web => jumpapp}/classes/Site.php | 0 {web => jumpapp}/classes/Sites.php | 0 {web => jumpapp}/composer.json | 0 {web => jumpapp}/composer.lock | 0 {web => jumpapp}/config.php | 0 {web => jumpapp}/index.php | 0 {web => jumpapp}/sites/icons/bitwarden.png | Bin {web => jumpapp}/sites/icons/gitea.png | Bin {web => jumpapp}/sites/icons/nextcloud.png | Bin {web => jumpapp}/sites/icons/paperless.jpg | Bin {web => jumpapp}/sites/sites.json | 0 {web => jumpapp}/templates/footer.mustache | 0 {web => jumpapp}/templates/greeting.mustache | 0 {web => jumpapp}/templates/header.mustache | 0 {web => jumpapp}/templates/sites.mustache | 0 33 files changed, 3 insertions(+), 3 deletions(-) rename {web => jumpapp}/assets/backgrounds/animal-g3298dcb04_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/budapest-g056b86516_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/building-gad730b330_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/nature-gbde25f3ce_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/san-francisco-g1a7f2aef8_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/sea-ga4cb2ef0b_1920.jpg (100%) rename {web => jumpapp}/assets/backgrounds/seagull-gc0701fe2f_1920.jpg (100%) rename {web => jumpapp}/assets/css/styles.css (100%) rename {web => jumpapp}/assets/images/default-icon.png (100%) rename {web => jumpapp}/assets/images/overlay.png (100%) rename {web => jumpapp}/assets/js/index.js (100%) rename {web => jumpapp}/background-css.php (100%) rename {web => jumpapp}/classes/Background.php (100%) rename {web => jumpapp}/classes/Cache.php (100%) rename {web => jumpapp}/classes/Config.php (100%) rename {web => jumpapp}/classes/Greeting.php (100%) rename {web => jumpapp}/classes/Main.php (100%) rename {web => jumpapp}/classes/Site.php (100%) rename {web => jumpapp}/classes/Sites.php (100%) rename {web => jumpapp}/composer.json (100%) rename {web => jumpapp}/composer.lock (100%) rename {web => jumpapp}/config.php (100%) rename {web => jumpapp}/index.php (100%) rename {web => jumpapp}/sites/icons/bitwarden.png (100%) rename {web => jumpapp}/sites/icons/gitea.png (100%) rename {web => jumpapp}/sites/icons/nextcloud.png (100%) rename {web => jumpapp}/sites/icons/paperless.jpg (100%) rename {web => jumpapp}/sites/sites.json (100%) rename {web => jumpapp}/templates/footer.mustache (100%) rename {web => jumpapp}/templates/greeting.mustache (100%) rename {web => jumpapp}/templates/header.mustache (100%) rename {web => jumpapp}/templates/sites.mustache (100%) diff --git a/Dockerfile b/Dockerfile index ac86c97..5a0b5f5 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Start with the official composer image, copy application files and install # dependencies. -FROM composer AS composer -COPY web/ /app +FROM composer AS builder +COPY jumpapp/ /app RUN composer install --no-dev \ --optimize-autoloader \ --no-interaction \ @@ -9,7 +9,7 @@ RUN composer install --no-dev \ # Switch to trafex/php-nginx image and copy application files into it. FROM trafex/php-nginx -COPY --chown=nginx --from=composer /app /var/www/html +COPY --chown=nginx --from=builder /app /var/www/html # The trafex/php-nginx image runs as "nobody" user so we need to switch to root # so we can make changes inside the container. diff --git a/web/assets/backgrounds/animal-g3298dcb04_1920.jpg b/jumpapp/assets/backgrounds/animal-g3298dcb04_1920.jpg similarity index 100% rename from web/assets/backgrounds/animal-g3298dcb04_1920.jpg rename to jumpapp/assets/backgrounds/animal-g3298dcb04_1920.jpg diff --git a/web/assets/backgrounds/budapest-g056b86516_1920.jpg b/jumpapp/assets/backgrounds/budapest-g056b86516_1920.jpg similarity index 100% rename from web/assets/backgrounds/budapest-g056b86516_1920.jpg rename to jumpapp/assets/backgrounds/budapest-g056b86516_1920.jpg diff --git a/web/assets/backgrounds/building-gad730b330_1920.jpg b/jumpapp/assets/backgrounds/building-gad730b330_1920.jpg similarity index 100% rename from web/assets/backgrounds/building-gad730b330_1920.jpg rename to jumpapp/assets/backgrounds/building-gad730b330_1920.jpg diff --git a/web/assets/backgrounds/nature-gbde25f3ce_1920.jpg b/jumpapp/assets/backgrounds/nature-gbde25f3ce_1920.jpg similarity index 100% rename from web/assets/backgrounds/nature-gbde25f3ce_1920.jpg rename to jumpapp/assets/backgrounds/nature-gbde25f3ce_1920.jpg diff --git a/web/assets/backgrounds/san-francisco-g1a7f2aef8_1920.jpg b/jumpapp/assets/backgrounds/san-francisco-g1a7f2aef8_1920.jpg similarity index 100% rename from web/assets/backgrounds/san-francisco-g1a7f2aef8_1920.jpg rename to jumpapp/assets/backgrounds/san-francisco-g1a7f2aef8_1920.jpg diff --git a/web/assets/backgrounds/sea-ga4cb2ef0b_1920.jpg b/jumpapp/assets/backgrounds/sea-ga4cb2ef0b_1920.jpg similarity index 100% rename from web/assets/backgrounds/sea-ga4cb2ef0b_1920.jpg rename to jumpapp/assets/backgrounds/sea-ga4cb2ef0b_1920.jpg diff --git a/web/assets/backgrounds/seagull-gc0701fe2f_1920.jpg b/jumpapp/assets/backgrounds/seagull-gc0701fe2f_1920.jpg similarity index 100% rename from web/assets/backgrounds/seagull-gc0701fe2f_1920.jpg rename to jumpapp/assets/backgrounds/seagull-gc0701fe2f_1920.jpg diff --git a/web/assets/css/styles.css b/jumpapp/assets/css/styles.css similarity index 100% rename from web/assets/css/styles.css rename to jumpapp/assets/css/styles.css diff --git a/web/assets/images/default-icon.png b/jumpapp/assets/images/default-icon.png similarity index 100% rename from web/assets/images/default-icon.png rename to jumpapp/assets/images/default-icon.png diff --git a/web/assets/images/overlay.png b/jumpapp/assets/images/overlay.png similarity index 100% rename from web/assets/images/overlay.png rename to jumpapp/assets/images/overlay.png diff --git a/web/assets/js/index.js b/jumpapp/assets/js/index.js similarity index 100% rename from web/assets/js/index.js rename to jumpapp/assets/js/index.js diff --git a/web/background-css.php b/jumpapp/background-css.php similarity index 100% rename from web/background-css.php rename to jumpapp/background-css.php diff --git a/web/classes/Background.php b/jumpapp/classes/Background.php similarity index 100% rename from web/classes/Background.php rename to jumpapp/classes/Background.php diff --git a/web/classes/Cache.php b/jumpapp/classes/Cache.php similarity index 100% rename from web/classes/Cache.php rename to jumpapp/classes/Cache.php diff --git a/web/classes/Config.php b/jumpapp/classes/Config.php similarity index 100% rename from web/classes/Config.php rename to jumpapp/classes/Config.php diff --git a/web/classes/Greeting.php b/jumpapp/classes/Greeting.php similarity index 100% rename from web/classes/Greeting.php rename to jumpapp/classes/Greeting.php diff --git a/web/classes/Main.php b/jumpapp/classes/Main.php similarity index 100% rename from web/classes/Main.php rename to jumpapp/classes/Main.php diff --git a/web/classes/Site.php b/jumpapp/classes/Site.php similarity index 100% rename from web/classes/Site.php rename to jumpapp/classes/Site.php diff --git a/web/classes/Sites.php b/jumpapp/classes/Sites.php similarity index 100% rename from web/classes/Sites.php rename to jumpapp/classes/Sites.php diff --git a/web/composer.json b/jumpapp/composer.json similarity index 100% rename from web/composer.json rename to jumpapp/composer.json diff --git a/web/composer.lock b/jumpapp/composer.lock similarity index 100% rename from web/composer.lock rename to jumpapp/composer.lock diff --git a/web/config.php b/jumpapp/config.php similarity index 100% rename from web/config.php rename to jumpapp/config.php diff --git a/web/index.php b/jumpapp/index.php similarity index 100% rename from web/index.php rename to jumpapp/index.php diff --git a/web/sites/icons/bitwarden.png b/jumpapp/sites/icons/bitwarden.png similarity index 100% rename from web/sites/icons/bitwarden.png rename to jumpapp/sites/icons/bitwarden.png diff --git a/web/sites/icons/gitea.png b/jumpapp/sites/icons/gitea.png similarity index 100% rename from web/sites/icons/gitea.png rename to jumpapp/sites/icons/gitea.png diff --git a/web/sites/icons/nextcloud.png b/jumpapp/sites/icons/nextcloud.png similarity index 100% rename from web/sites/icons/nextcloud.png rename to jumpapp/sites/icons/nextcloud.png diff --git a/web/sites/icons/paperless.jpg b/jumpapp/sites/icons/paperless.jpg similarity index 100% rename from web/sites/icons/paperless.jpg rename to jumpapp/sites/icons/paperless.jpg diff --git a/web/sites/sites.json b/jumpapp/sites/sites.json similarity index 100% rename from web/sites/sites.json rename to jumpapp/sites/sites.json diff --git a/web/templates/footer.mustache b/jumpapp/templates/footer.mustache similarity index 100% rename from web/templates/footer.mustache rename to jumpapp/templates/footer.mustache diff --git a/web/templates/greeting.mustache b/jumpapp/templates/greeting.mustache similarity index 100% rename from web/templates/greeting.mustache rename to jumpapp/templates/greeting.mustache diff --git a/web/templates/header.mustache b/jumpapp/templates/header.mustache similarity index 100% rename from web/templates/header.mustache rename to jumpapp/templates/header.mustache diff --git a/web/templates/sites.mustache b/jumpapp/templates/sites.mustache similarity index 100% rename from web/templates/sites.mustache rename to jumpapp/templates/sites.mustache