Skip to content

Commit

Permalink
Removed PHP 7.4 and fixed python installation
Browse files Browse the repository at this point in the history
  • Loading branch information
foorschtbar committed Feb 1, 2024
1 parent b921e5d commit d5aa2a4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
fail-fast: false
matrix:
php: ["7.4", "8.3"]
php: ["8.3"]
python: ["python", "no-python"]
include:
- php: "8.3"
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
steps:
- name: git checkout
uses: actions/checkout@v4

- name: push README to Dockerhub
uses: christian-korneck/update-container-description-action@v1
env:
Expand Down
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG FROM_TAG
ARG FROM_TAG=8.3-apache

FROM php:$FROM_TAG

Expand Down Expand Up @@ -61,15 +61,17 @@ RUN if [ "$PYTHON" = "python" ]; then \
echo "Build image with python"; \
apt-get update && apt-get install -y \
# python
python3 python3-pip python3-dev build-essential \
python3 python3-pip python3-dev python3-venv build-essential \
# cleanup
&& rm -r /var/lib/apt/lists/*; \
fi

# install python modules
RUN if [ "$PYTHON" = "python" ]; then \
set -eux; \
pip3 install js2py pytz tzlocal cfscrape; \
python3 -m venv /opt/venv; \
. /opt/venv/bin/activate; \
python3 -m pip install js2py pytz tzlocal cfscrape; \
fi

# overwrite docker entrypoint
Expand Down
4 changes: 0 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,6 @@ This is an usefull extension of the official php:\*-apache Docker image.
| `latest` | 8.3 | master | no |
| `python` | 8.3 | master | yes |
| `develop` | 8.3 | develop | no |
| `7.4` | 7.4 | master | no |
| `7.4-develop` | 7.4 | develop | no |
| `7.4-python` | 7.4 | master | yes |
| `7.4-python-develop` | 7.4 | develop | yes |
| `8.3` | 8.3 | master | no |
| `8.3-develop` | 8.3 | develop | no |
| `8.3-python` | 8.3 | master | yes |
Expand Down

0 comments on commit d5aa2a4

Please sign in to comment.