Merge pull request 'Update .woodpecker/build.yml' (#8) from dev into master

Reviewed-on: #8

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "build/submodules/artisan-bash-completion"]
+	path = build/submodules/artisan-bash-completion
+	url = https://gitlab.com/balping/artisan-bash-completion.git

.woodpecker/build-dev.yaml

@@ -1,7 +1,22 @@
 when:
   branch: dev
 
-pipeline:
+steps:
+    update_submodule:
+        image: woodpeckerci/plugin-git
+        secrets:
+            -   source: gitea_token
+                target: GITEA_TOKEN
+            -   source: gitea_user
+                target: GITEA_USER
+        commands:
+            - git submodule update --remote
+            - if [ ! "$(git status --porcelain)" ]; then echo "no changes"; exit 0; fi
+            - git config user.name "$${GITEA_USER}"
+            - git config user.email "$${GITEA_USER}.gitea@narvas.tech"
+            - git add -A
+            - git commit -m "update submodules [skip ci]"
+            - git push "https://$${GITEA_USER}:$${GITEA_TOKEN}@git.narvas.tech/$${CI_REPO}"
     check_base:
         image: vistanarvas/container-update-checker:latest
         secrets:
@@ -27,4 +42,4 @@ pipeline:
             path:
                 include: [ '.woodpecker/build-dev.yaml', 'build/*', 'Dockerfile' ]
             cron: nightly
-            event: [push, cron, manual]
+            event: [push, cron, manual]

.woodpecker/build.yml

@@ -1,7 +1,25 @@
 when:
   branch: master
 
-pipeline:
+steps:
+    update_submodule:
+        image: woodpeckerci/plugin-git
+        secrets:
+            -   source: gitea_token
+                target: GITEA_TOKEN
+            -   source: gitea_user
+                target: GITEA_USER
+        commands:
+            - git submodule update --remote
+            - if [ ! "$(git status --porcelain)" ]; then echo "no changes"; exit 0; fi
+            - git config user.name "$${GITEA_USER}"
+            - git config user.email "$${GITEA_USER}.gitea@narvas.tech"
+            - git add -A
+            - git commit -m "update submodules [skip ci]"
+            - git push "https://$${GITEA_USER}:$${GITEA_TOKEN}@git.narvas.tech/$${CI_REPO}"
+        when:
+            cron: nightly
+            event: [push, tag, deployment, cron, manual]
     check_base:
         image: vistanarvas/container-update-checker:latest
         secrets:

Dockerfile

@@ -8,10 +8,11 @@ ARG COMPOSER_VERSION='' # composer version number like "2.1" or empty for the la
 ENV NVM_DIR="/home/$USERNAME/.nvm"
 
 COPY start-container.sh /usr/local/bin/start-container
+COPY submodules/artisan-bash-completion/artisan /etc/bash_completion.d/artisan
 
 RUN export DEBIAN_FRONTEND=noninteractive \
 	&& apt-get -y update \
-	&& apt-get install -y curl git 7zip php php-xml php-curl php-xml php-mbstring php-mysql \
+	&& apt-get install -y curl git 7zip php php-xml php-curl php-xml php-mbstring php-mysql php-gd \
 	&& useradd --create-home --uid=$USER_UID $USERNAME \
 	&& chmod +x /usr/local/bin/start-container \
 	&& echo "install composer" \
@@ -22,7 +23,9 @@ RUN export DEBIAN_FRONTEND=noninteractive \
 	&& if [ -n "$COMPOSER_VERSION" ]; then COMPOSER_VERSION="--${COMPOSER_VERSION}"; fi \
 	&& php composer-setup.php --install-dir=/usr/local/bin --filename=composer $COMPOSER_VERSION \
 	&& rm composer-setup.php composer-setup.sig /var/www/html/* \
-	&& chown $USERNAME:$USERNAME /var/www/html
+	&& chown $USERNAME:$USERNAME /var/www/html \
+	&& echo 'alias artisan="php artisan"' >> /etc/bash.bashrc \
+	&& echo 'source /etc/bash_completion.d/*' >> /etc/bash.bashrc
 
 EXPOSE 8080
 

Readme.md

@@ -0,0 +1,36 @@
+# simple-laravel
+
+
+
+## setting laravel up in a container
+
+### vite
+edit `/vite.config.js`
+```diff
+ import laravel from 'laravel-vite-plugin';
+ 
+ export default defineConfig({
++    server: {
++        hmr: {
++            host: '[Server Domain or IP]'
++        },
++    },
+     plugins: [
+         laravel({
+             input: [
+
+```
+
+edit `/package.json`
+
+```diff
+     "private": true,
+     "type": "module",
+     "scripts": {
+-        "dev": "vite",
++        "dev": "vite --host 0.0.0.0",
+         "build": "vite build"
+     },
+     "devDependencies": {
+
+```

build/start-container.sh

@@ -6,14 +6,16 @@ set -e
 # init nvm
 \. $NVM_DIR/nvm.sh
 
+
+if [[ "$INSTALL_BEFORE_START" = true ]]; then
+    echo "composer and npm install"
+    composer install
+    npm install
+fi
+
 if [ ! -f /var/www/html/artisan ]; then
     echo "No existing Laravel project found"
-    composer create-project laravel/laravel /var/www/html "$LARAVEL_VERSION"
+    exit
-    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
 fi
 
 if [[ "$AUTO_START_NPM_DEV" = true ]]; then
@@ -22,4 +24,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