Adjust the directory structure
This commit is contained in:
parent
b1cc1cca39
commit
dd6559a4aa
23 changed files with 21 additions and 16 deletions
|
@ -11,7 +11,7 @@ LICENSE
|
||||||
.vscode
|
.vscode
|
||||||
|
|
||||||
# SilverStripe auto-generated content
|
# SilverStripe auto-generated content
|
||||||
Website/silverstripe-cache/
|
/silverstripe-cache/
|
||||||
Website/vendor/
|
/vendor/
|
||||||
Website/resources/
|
/resources/
|
||||||
Website/public/resources/
|
/public/resources/
|
7
.gitignore
vendored
7
.gitignore
vendored
|
@ -4,3 +4,10 @@ composer.phar
|
||||||
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
|
# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#commit-your-composer-lock-file-to-version-control
|
||||||
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
|
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
|
||||||
# composer.lock
|
# composer.lock
|
||||||
|
|
||||||
|
# SvilerStripe files
|
||||||
|
/silverstripe-cache/
|
||||||
|
/vendor/
|
||||||
|
/themes/simple/
|
||||||
|
/resources/
|
||||||
|
/public/resources/
|
||||||
|
|
4
.vscode/tasks.json
vendored
4
.vscode/tasks.json
vendored
|
@ -4,10 +4,10 @@
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"tasks": [
|
"tasks": [
|
||||||
{
|
{
|
||||||
"label": "Lint Website",
|
"label": "Lint PHP-Code",
|
||||||
"type": "shell",
|
"type": "shell",
|
||||||
"options": {
|
"options": {
|
||||||
"cwd": "${workspaceFolder}/Website"
|
"cwd": "${workspaceFolder}"
|
||||||
},
|
},
|
||||||
"command": "composer",
|
"command": "composer",
|
||||||
"args": [
|
"args": [
|
||||||
|
|
|
@ -33,7 +33,7 @@ RUN docker-php-ext-enable \
|
||||||
ADD https://getcomposer.org/installer composer-setup.php
|
ADD https://getcomposer.org/installer composer-setup.php
|
||||||
RUN php composer-setup.php
|
RUN php composer-setup.php
|
||||||
RUN mv composer.phar /usr/local/bin/composer
|
RUN mv composer.phar /usr/local/bin/composer
|
||||||
COPY --chown=www-data:www-data ./Website/composer.* ./
|
COPY --chown=www-data:www-data ./composer.* ./
|
||||||
RUN sudo -u www-data mkdir public
|
RUN sudo -u www-data mkdir public
|
||||||
RUN sudo -u www-data composer install
|
RUN sudo -u www-data composer install
|
||||||
|
|
||||||
|
@ -41,5 +41,5 @@ COPY --chown=www-data:www-data .docker/.env .env
|
||||||
|
|
||||||
COPY .docker/xdebug.ini $PHP_INI_DIR/conf.d/
|
COPY .docker/xdebug.ini $PHP_INI_DIR/conf.d/
|
||||||
COPY .docker/date.ini $PHP_INI_DIR/conf.d/
|
COPY .docker/date.ini $PHP_INI_DIR/conf.d/
|
||||||
COPY --chown=www-data:www-data ./Website/ ./
|
COPY --chown=www-data:www-data ./ ./
|
||||||
RUN sudo -u www-data composer vendor-expose
|
RUN sudo -u www-data composer vendor-expose
|
||||||
|
|
6
Website/.gitignore
vendored
6
Website/.gitignore
vendored
|
@ -1,6 +0,0 @@
|
||||||
/silverstripe-cache/
|
|
||||||
/.env
|
|
||||||
/vendor/
|
|
||||||
/themes/simple/
|
|
||||||
/resources/
|
|
||||||
/public/resources/
|
|
0
Website/composer.lock → composer.lock
generated
0
Website/composer.lock → composer.lock
generated
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
@ -8,11 +8,15 @@ find $sourceDir \
|
||||||
-name "*" -and \
|
-name "*" -and \
|
||||||
-not \( \
|
-not \( \
|
||||||
\( \
|
\( \
|
||||||
-path "Website"
|
-path "$sourceDir/app" \
|
||||||
|
-path "$sourceDir/public" \
|
||||||
|
-path "$sourceDir/vendor" \
|
||||||
|
-path "$sourceDir/themes" \
|
||||||
\) \
|
\) \
|
||||||
-prune \
|
-prune \
|
||||||
\) -and \
|
\) -and \
|
||||||
-not -name ".env" \
|
-not -name ".env" -and \
|
||||||
|
-not -name ".htaccess" \
|
||||||
-print
|
-print
|
||||||
|
|
||||||
rsync -a --delete $sourceDir $tempDir
|
rsync -a --delete $sourceDir $tempDir
|
||||||
|
|
Loading…
Reference in a new issue