Skip to content

Commit d438070

Browse files
authored
Merge pull request #30 from devilbox/release-0.17
Streamline
2 parents cb90334 + 1727484 commit d438070

File tree

12 files changed

+301
-117
lines changed

12 files changed

+301
-117
lines changed

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
github: [cytopia]
3+
patreon: devilbox

.github/workflows/params.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
with:
5454
repository_default_branch: master
5555
branches: master
56-
num_latest_tags: 1
56+
num_latest_tags: 0
5757
if: github.event_name == 'schedule'
5858

5959
- name: "[DEBUG] Show settings'"
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ TAG = latest
2727
NAME = PHP
2828
VERSION = 8.0
2929
IMAGE = devilbox/php-fpm-$(VERSION)
30-
DIR = .
30+
DIR = Dockerfiles
3131
FILE = Dockerfile
3232
DOCKER_TAG = $(TAG)
3333
ARCH = linux/amd64
3434

3535
# Makefile.lint overwrites
36-
FL_IGNORES = .git/,.github/,tests/,data/
36+
FL_IGNORES = .git/,.github/,tests/,Dockerfiles/data/
3737
SC_IGNORES = .git/,.github/,tests/
3838

3939

@@ -92,7 +92,7 @@ _test-integration:
9292
.PHONY: update-readme
9393
update-readme:
9494
cat "./README.md" \
95-
| perl -0 -pe "s/<!-- modules -->.*<!-- \/modules -->/<!-- modules -->\n$$(./tests/get-modules.sh $(IMAGE) $(NAME) $(VERSION) $(DOCKER_TAG) $(ARCH))\n<!-- \/modules -->/s" \
95+
| perl -0 -pe "s#<!-- modules -->.*<!-- \/modules -->#<!-- modules -->\n$$(./tests/get-modules.sh $(IMAGE) $(NAME) $(VERSION) $(DOCKER_TAG) $(ARCH))\n<!-- \/modules -->#s" \
9696
> "./README.md.tmp"
9797
yes | mv -f "./README.md.tmp" "./README.md"
9898
git diff --quiet || { echo "Build Changes"; git diff; git status; false; }

0 commit comments

Comments
 (0)