Compare commits

..

No commits in common. "85b2635da32be5d38a2df282291e37a14bb9f76b" and "983ce40397c6d650cbc1e74dee430fbcf0d581cc" have entirely different histories.

7 changed files with 33 additions and 12114 deletions

View file

@ -3,7 +3,6 @@
"dockerComposeFile": "docker-compose.yml", "dockerComposeFile": "docker-compose.yml",
"service": "silverstripe", "service": "silverstripe",
"workspaceFolder": "/shared-workspaces/mantra", "workspaceFolder": "/shared-workspaces/mantra",
"remoteUser": "vscode",
"extensions": [ "extensions": [
"adrianhumphreys.silverstripe", "adrianhumphreys.silverstripe",
"bmewburn.vscode-intelephense-client", "bmewburn.vscode-intelephense-client",

View file

@ -2,9 +2,7 @@ version: '3'
services: services:
silverstripe: silverstripe:
build: image: manuth/silverstripe-dev
context: .
dockerfile: web.Dockerfile
env_file: devcontainer.env env_file: devcontainer.env
environment: environment:
- SS_ENVIRONMENT_TYPE=dev - SS_ENVIRONMENT_TYPE=dev

View file

@ -1,4 +1,6 @@
#!/bin/bash #!/bin/bash
echo '* text=auto eol=lf' > $(git rev-parse --git-dir)/info/attributes echo '* text=auto eol=lf' > $(git rev-parse --git-dir)/info/attributes
sudo rm -rf /var/www/html rm -rf /var/www/html
sudo ln -sT $(pwd)/test/website /var/www/html ln -sT `pwd`/test/website /var/www/html
chown -R www-data:www-data ./test/website
chown -R www-data:www-data /var/www/html

View file

@ -1,10 +0,0 @@
FROM manuth/silverstripe-dev
RUN apt-get update && \
apt-get -y install sudo && \
rm -rf /var/lib/apt/lists/*
RUN adduser --disabled-password --gecos '' vscode && \
sed -i /etc/sudoers -re 's/^%sudo.*/%sudo ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
sed -i /etc/sudoers -re 's/^root.*/root ALL=(ALL:ALL) NOPASSWD: ALL/g' && \
echo 'vscode ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers

View file

@ -84,10 +84,5 @@
"composer --working-dir=./test/website install" "composer --working-dir=./test/website install"
] ]
} }
},
"config": {
"allow-plugins": {
"neronmoon/scriptsdev": true
}
} }
} }

12114
package-lock.json generated

File diff suppressed because it is too large Load diff

View file

@ -42,12 +42,7 @@
] ]
}, },
"config": { "config": {
"process-timeout": 600, "process-timeout": 600
"allow-plugins": {
"composer/installers": true,
"silverstripe/recipe-plugin": true,
"silverstripe/vendor-plugin": true
}
}, },
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"