diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6b48ef0..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "build/submodules/artisan-bash-completion"] - path = build/submodules/artisan-bash-completion - url = https://gitlab.com/balping/artisan-bash-completion.git diff --git a/.woodpecker/build-dev.yaml b/.woodpecker/build-dev.yaml deleted file mode 100644 index 49b9e53..0000000 --- a/.woodpecker/build-dev.yaml +++ /dev/null @@ -1,45 +0,0 @@ -when: - branch: dev - -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: - - 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: - path: - include: [ '.woodpecker/build-dev.yaml', 'build/*', 'Dockerfile' ] - cron: nightly - event: [push, cron, manual] \ No newline at end of file diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml index 55182b7..231c10c 100644 --- a/.woodpecker/build.yml +++ b/.woodpecker/build.yml @@ -2,37 +2,7 @@ when: branch: master 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: - - 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: + release_build_and_publish: image: woodpeckerci/plugin-docker-buildx settings: username: vistanarvas @@ -45,4 +15,19 @@ steps: path: include: [ '.woodpecker/build.yml', 'build/*', 'Dockerfile' ] cron: nightly - event: [push, tag, deployment, cron, manual] + event: tag + + 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: nightly + when: + path: + include: [ '.woodpecker/build.yml', 'build/*', 'Dockerfile' ] + cron: nightly + event: cron diff --git a/Dockerfile b/Dockerfile index 575026b..e9bda71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,8 +2,12 @@ FROM ubuntu:latest ARG USERNAME=laravel ARG USER_UID=1000 -ARG NODE_VERSION='' # node version number like "12.22.1" or empty for the latest version -ARG COMPOSER_VERSION='' # composer version number like "2.1" or empty for the latest version + +# node version number like "12.22.1" or empty for the latest version +ARG NODE_VERSION='' + +# composer version number like "2.1" or empty for the latest version +ARG COMPOSER_VERSION='' ENV NVM_DIR="/home/$USERNAME/.nvm" @@ -24,8 +28,6 @@ RUN export DEBIAN_FRONTEND=noninteractive \ && 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 \ - && echo 'alias artisan="php artisan"' >> /etc/bash.bashrc \ - && echo 'source /etc/bash_completion.d/*' >> /etc/bash.bashrc EXPOSE 8080 diff --git a/build/submodules/artisan-bash-completion b/build/submodules/artisan-bash-completion deleted file mode 160000 index ca19968..0000000 --- a/build/submodules/artisan-bash-completion +++ /dev/null @@ -1 +0,0 @@ -Subproject commit ca19968a5f5f3e7ee0ed22cf9c046aec6d3565e2