From 7d91e90f226d69302659f6d1208d66632d5ceb3f Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 10 Feb 2025 17:47:54 +0100 Subject: [PATCH 1/3] =?UTF-8?q?=E2=9C=A8=20allow=20execution=20of=20local?= =?UTF-8?q?=20files?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .additional_bashrc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.additional_bashrc.sh b/.additional_bashrc.sh index df1b937..a0c603a 100644 --- a/.additional_bashrc.sh +++ b/.additional_bashrc.sh @@ -1,6 +1,6 @@ export LS_COLORS="${LS_COLORS}di=1;34:" alias ll='ls -alh' -export PATH=$PATH:~/.config/composer/vendor/bin:~/.composer/vendor/bin:./bin:./vendor/bin:./node_modules/.bin +export PATH=$PATH:~/.config/composer/vendor/bin:~/.composer/vendor/bin:./bin:./vendor/bin:./node_modules/.bin:. # only enable docker aliases if docker-socket is mounted CONTAINER_ID=$(basename $(findmnt /etc/hosts -o SOURCE | grep -o 'containers\/.\+\/')) From f86173a4f1e909af619fc718fa36327817d9fbe3 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Mon, 10 Feb 2025 18:46:24 +0100 Subject: [PATCH 2/3] Update .additional_bashrc.sh --- .additional_bashrc.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.additional_bashrc.sh b/.additional_bashrc.sh index a0c603a..e828e99 100644 --- a/.additional_bashrc.sh +++ b/.additional_bashrc.sh @@ -1,5 +1,6 @@ export LS_COLORS="${LS_COLORS}di=1;34:" alias ll='ls -alh' +# add some PATHS for development export PATH=$PATH:~/.config/composer/vendor/bin:~/.composer/vendor/bin:./bin:./vendor/bin:./node_modules/.bin:. # only enable docker aliases if docker-socket is mounted From 66b4e94b296ae7071616f245c5bc7cec7c0b9848 Mon Sep 17 00:00:00 2001 From: Matthias Vogel Date: Tue, 11 Feb 2025 09:37:40 +0000 Subject: [PATCH 3/3] =?UTF-8?q?=F0=9F=94=A5=20remove=20php=207=20from=20pi?= =?UTF-8?q?peline?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/main.yml | 6 +++--- Dockerfile | 4 ++-- README.md | 11 ++++++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3a007bb..4ca350e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -2,8 +2,8 @@ name: ci on: schedule: - # build every first of the month - - cron: '0 0 1 * *' + # build every Monday at 7:00 + - cron: '0 7 * * 1' push: workflow_dispatch: @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - php: [ '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2', '8.3' ] + php: [ '8.0', '8.1', '8.2', '8.3' ] webserver: [ 'apache', 'nginx' ] distroAddon: [ '', '-alpine' ] steps: diff --git a/Dockerfile b/Dockerfile index b43055d..5451660 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ ARG FROM=webdevops/php-nginx-dev:8.2-alpine ARG DIST_ADDON=-alpine -FROM $FROM as base-alpine +FROM $FROM AS base-alpine # Install additional software Alpine: RUN apk add --no-cache sudo vim nano git-perl less tree bash-completion mariadb-client iputils sshpass gdb tzdata findmnt jq docker-cli file && \ echo "application ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers -FROM $FROM as base +FROM $FROM AS base # Install additional software Debian: RUN apt-get update && \ apt-get install -y sudo vim nano less tree bash-completion mariadb-client iputils-ping sshpass gdb jq && \ diff --git a/README.md b/README.md index 6eea94d..5c7966c 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,14 @@ We recommend using [pluswerk/docker-global](https://github.com/pluswerk/docker-g # Tags -- php versions supported: `7.1`-`8.3` +- php versions supported: `8.0`-`8.3` +- php versions unsupported: `5.6`-`7.4` - webserver supported: `nginx` and `apache` - alpine images: `-alpine` - examples - - `ghcr.io/pluswerk/php-dev:nginx-8.3-alpine` - - `ghcr.io/pluswerk/php-dev:apache-7.1-alpine` - - `ghcr.io/pluswerk/php-dev:nginx-8.0` + - `pluswerk/php-dev:nginx-8.3-alpine` + - `pluswerk/php-dev:apache-8.0-alpine` + - `pluswerk/php-dev:nginx-8.2` - list of [all Tags](https://github.com/pluswerk/php-dev/pkgs/container/php-dev/versions?filters%5Bversion_type%5D=tagged) ## Setup @@ -55,7 +56,7 @@ Example file: compose/Development/docker-compose.yml ```yaml services: web: - image: ghcr.io/pluswerk/php-dev:nginx-8.3-alpine + image: pluswerk/php-dev:nginx-8.3-alpine volumes: - .:/app