From 48160fd97d406eb3fcc175b1b13a1db883752516 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:02:08 +0100 Subject: [PATCH 01/17] Update 'build/start-container.sh' [skip ci] --- build/{start-container => start-container.sh} | 5 +++++ 1 file changed, 5 insertions(+) rename build/{start-container => start-container.sh} (71%) diff --git a/build/start-container b/build/start-container.sh similarity index 71% rename from build/start-container rename to build/start-container.sh index 83775ca..9ba4e75 100644 --- a/build/start-container +++ b/build/start-container.sh @@ -11,6 +11,11 @@ if [ ! -f /var/www/html/artisan ]; then 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 + if [[ "$WEBHOOK" = true ]]; then + composer --working-dir=/var/www/html require spatie/laravel-webhook-client + php /var/www/html/artisan vendor:publish --provider="Spatie\WebhookClient\WebhookClientServiceProvider" --tag="webhook-client-config" + php /var/www/html/artisan vendor:publish --provider="Spatie\WebhookClient\WebhookClientServiceProvider" --tag="webhook-client-migrations" + fi fi if [[ "$AUTO_START_NPM_DEV" = true ]]; then From 6c17d233d810358c536248ee1d9578d0fa3ad6bb Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:02:22 +0100 Subject: [PATCH 02/17] Update 'build/start-container' [skip ci] --- build/{start-container.sh => start-container} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/{start-container.sh => start-container} (100%) diff --git a/build/start-container.sh b/build/start-container similarity index 100% rename from build/start-container.sh rename to build/start-container From 14df49cd45830c72892d65672f9081ee2668322b Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:11:40 +0100 Subject: [PATCH 03/17] Update 'build/Dockerfile' --- build/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/build/Dockerfile b/build/Dockerfile index e4c86c9..758527b 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -22,6 +22,7 @@ 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 EXPOSE 8080 From ac363dccb72901c8611680f77e0e0a2f7b3dd216 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:12:08 +0100 Subject: [PATCH 04/17] move docker file [SKIP CI] --- build/Dockerfile => Dockerfile | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename build/Dockerfile => Dockerfile (100%) diff --git a/build/Dockerfile b/Dockerfile similarity index 100% rename from build/Dockerfile rename to Dockerfile From 8649b867437da79545bb2f5046047dcaae12b34a Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:12:34 +0100 Subject: [PATCH 05/17] move Dockerfile --- .woodpecker/build.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index ad16a97..8beadb4 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -18,7 +18,6 @@ pipeline: password: from_secret: DOCKERHUB_TOKEN context: ./build - dockerfile: ./build/Dockerfile repo: vistanarvas/${CI_REPO_NAME} auto_tag: true when: From 05c1afb8e535e4e2dbf25176d43664dd9ebd8ecf Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:13:29 +0100 Subject: [PATCH 06/17] fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 758527b..14a9c21 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && sha384sum -c composer-setup.sig \ && 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/* + && rm composer-setup.php composer-setup.sig /var/www/html/* \ && chown $USERNAME:$USERNAME /var/www/html EXPOSE 8080 From 81a41040bbb74abc7eb0363f309796caea4c848a Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:15:50 +0100 Subject: [PATCH 07/17] Update '.woodpecker/build.yml' --- .woodpecker/build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 8beadb4..874ff50 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -21,7 +21,8 @@ pipeline: repo: vistanarvas/${CI_REPO_NAME} auto_tag: true when: + branch: master path: - include: [ '.woodpecker/build.yml', 'build/*' ] + include: [ '.woodpecker/build.yml', 'build/*', 'Dockerfile' ] cron: nightly event: [push, tag, deployment, cron, manual] From ff8d6f4390e99661143ee5a2f55e853ac3befde5 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:17:38 +0100 Subject: [PATCH 08/17] Add '.woodpecker/build-dev.yaml' --- .woodpecker/build-dev.yaml | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 .woodpecker/build-dev.yaml diff --git a/.woodpecker/build-dev.yaml b/.woodpecker/build-dev.yaml new file mode 100644 index 0000000..fee692f --- /dev/null +++ b/.woodpecker/build-dev.yaml @@ -0,0 +1,28 @@ +pipeline: + check_base: + image: vistanarvas/container-update-checker:latest + secrets: + - source: dockerhub_token + target: docker_password + environment: + DOCKER_USERNAME: vistanarvas + BASE: ubuntu:latest + TARGET: vistanarvas/${CI_REPO_NAME}:latest + when: + cron: nightly + event: cron + build_and_publish: + image: woodpeckerci/plugin-docker-buildx + settings: + username: vistanarvas + password: + from_secret: DOCKERHUB_TOKEN + context: ./build + repo: vistanarvas/${CI_REPO_NAME} + tag: dev + when: + branch: dev + path: + include: [ '.woodpecker/build-dev.yaml', 'build/*', 'Dockerfile' ] + cron: nightly + event: [push, tag, deployment, cron, manual] From f49d94041f353bf93f6d6434fa627464d0dee900 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:24:54 +0100 Subject: [PATCH 09/17] Update '.woodpecker/build.yml' [skip ci] --- .woodpecker/build.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 874ff50..045b370 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -1,3 +1,6 @@ +when: + branch: master + pipeline: check_base: image: vistanarvas/container-update-checker:latest @@ -21,7 +24,6 @@ pipeline: repo: vistanarvas/${CI_REPO_NAME} auto_tag: true when: - branch: master path: include: [ '.woodpecker/build.yml', 'build/*', 'Dockerfile' ] cron: nightly From 3c8b1f42c565102060a53bb4df08a1a61bcbb1f1 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:25:16 +0100 Subject: [PATCH 10/17] Update '.woodpecker/build-dev.yaml' [skip ci] --- .woodpecker/build-dev.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.woodpecker/build-dev.yaml b/.woodpecker/build-dev.yaml index fee692f..d7441da 100644 --- a/.woodpecker/build-dev.yaml +++ b/.woodpecker/build-dev.yaml @@ -1,3 +1,6 @@ +when: + branch: dev + pipeline: check_base: image: vistanarvas/container-update-checker:latest @@ -21,7 +24,6 @@ pipeline: repo: vistanarvas/${CI_REPO_NAME} tag: dev when: - branch: dev path: include: [ '.woodpecker/build-dev.yaml', 'build/*', 'Dockerfile' ] cron: nightly From aaf97839f8aa5ea3a15a47d667c5d53bc27a17a6 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:27:20 +0100 Subject: [PATCH 11/17] Update 'build/start-container' --- build/start-container | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/start-container b/build/start-container index 9ba4e75..35a0cb0 100644 --- a/build/start-container +++ b/build/start-container @@ -3,6 +3,9 @@ # exit when any command fails set -e +# init nvm +\. $NVM_DIR/nvm.sh + if [ ! -f /var/www/html/artisan ]; then echo "No existing Laravel project found" composer create-project laravel/laravel /var/www/html "$LARAVEL_VERSION" From 1ca34319c83d8a445c39098dbec8fa49ebe749dc Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:36:17 +0100 Subject: [PATCH 12/17] fix trailing \ --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 14a9c21..7d62c39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,6 +36,6 @@ RUN echo "install nvm and node" \ && echo "source $NVM_DIR/nvm.sh" >> /home/$USERNAME/.bashrc \ && [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" \ && nvm install $NODE_VERSION \ - && nvm alias default $NODE_VERSION \ + && nvm alias default $NODE_VERSION ENTRYPOINT ["start-container"] \ No newline at end of file From 5870025017e17b2512cca3c5a0dc526225ae50a1 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:49:21 +0100 Subject: [PATCH 13/17] Update 'build/start-container.sh' [SKIP CI] --- build/{start-container => start-container.sh} | 5 ----- 1 file changed, 5 deletions(-) rename build/{start-container => start-container.sh} (72%) diff --git a/build/start-container b/build/start-container.sh similarity index 72% rename from build/start-container rename to build/start-container.sh index 35a0cb0..b6f3936 100644 --- a/build/start-container +++ b/build/start-container.sh @@ -14,11 +14,6 @@ if [ ! -f /var/www/html/artisan ]; then 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 - if [[ "$WEBHOOK" = true ]]; then - composer --working-dir=/var/www/html require spatie/laravel-webhook-client - php /var/www/html/artisan vendor:publish --provider="Spatie\WebhookClient\WebhookClientServiceProvider" --tag="webhook-client-config" - php /var/www/html/artisan vendor:publish --provider="Spatie\WebhookClient\WebhookClientServiceProvider" --tag="webhook-client-migrations" - fi fi if [[ "$AUTO_START_NPM_DEV" = true ]]; then From fef9baec62aa394f9f0515b0df8559fbe881db23 Mon Sep 17 00:00:00 2001 From: vista Date: Thu, 16 Mar 2023 13:49:39 +0100 Subject: [PATCH 14/17] Update 'Dockerfile' [SKIP CI] --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d62c39..7b0bb8c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ ARG COMPOSER_VERSION='' # composer version number like "2.1" or empty for the la ENV NVM_DIR="/home/$USERNAME/.nvm" -COPY start-container /usr/local/bin/start-container +COPY start-container.sh /usr/local/bin/start-container RUN export DEBIAN_FRONTEND=noninteractive \ && apt-get -y update \ From a35ae28a214f426ecbdf57ce6eac6b07cce65129 Mon Sep 17 00:00:00 2001 From: vista Date: Tue, 15 Aug 2023 14:41:14 +0200 Subject: [PATCH 15/17] Update .woodpecker/build.yml --- .woodpecker/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 045b370..cf3c123 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -1,7 +1,7 @@ when: branch: master -pipeline: +steps: check_base: image: vistanarvas/container-update-checker:latest secrets: From e5a0cde61486b80a08f997457836b2b5061b5745 Mon Sep 17 00:00:00 2001 From: vista Date: Tue, 15 Aug 2023 14:41:21 +0200 Subject: [PATCH 16/17] Update .woodpecker/build-dev.yaml --- .woodpecker/build-dev.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.woodpecker/build-dev.yaml b/.woodpecker/build-dev.yaml index d7441da..d650ea4 100644 --- a/.woodpecker/build-dev.yaml +++ b/.woodpecker/build-dev.yaml @@ -1,7 +1,7 @@ when: branch: dev -pipeline: +steps: check_base: image: vistanarvas/container-update-checker:latest secrets: From 129af47626c4b507e84af5bd72fcc681e7c13092 Mon Sep 17 00:00:00 2001 From: vista Date: Tue, 15 Aug 2023 14:49:07 +0200 Subject: [PATCH 17/17] Update build/start-container.sh --- build/start-container.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/build/start-container.sh b/build/start-container.sh index b6f3936..ed34020 100644 --- a/build/start-container.sh +++ b/build/start-container.sh @@ -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