Merge branch 'dev'

# Conflicts:
#	.woodpecker/build-dev.yaml
#	.woodpecker/build.yml
#	build/start-container.sh
This commit is contained in:
Ruben Momoa
2023-08-17 17:13:12 +02:00
2 changed files with 3 additions and 8 deletions

View File

@@ -1,7 +1,7 @@
when:
branch: master
pipeline:
steps:
check_base:
image: vistanarvas/container-update-checker:latest
secrets:

View File

@@ -8,12 +8,7 @@ set -e
if [ ! -f /var/www/html/artisan ]; then
echo "No existing Laravel project found"
composer create-project laravel/laravel /var/www/html "$LARAVEL_VERSION"
npm install -D tailwindcss postcss autoprefixer --prefix /var/www/html
sed -i "/export default defineConfig({/a\ server: {host: '0.0.0.0'}," /var/www/html/vite.config.js
echo -e "@tailwind base;\n@tailwind components;\n@tailwind utilities;" >> /var/www/html/resources/css/app.css
echo -e '/** @type {import('tailwindcss').Config} */\nmodule.exports = {\n content: [\n "./resources/**/*.blade.php",\n "./resources/**/*.js",\n "./resources/**/*.vue",\n ],\n theme: {\n extend: {},\n },\n plugins: [],\n}' > /var/www/html/tailwind.config.js
npx tailwindcss init -p
exit
fi
if [[ "$AUTO_START_NPM_DEV" = true ]]; then
@@ -22,4 +17,4 @@ if [[ "$AUTO_START_NPM_DEV" = true ]]; then
fi
echo "Staring Laravel"
php /var/www/html/artisan serve --host=0.0.0.0 --port=8080
php /var/www/html/artisan serve