Skip to content

Commit 3b3d9b0

Browse files
committed
feat: add nasm
1 parent 7b11e17 commit 3b3d9b0

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

fpm-alpine/8.3/dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apk update && apk upgrade && apk add --no-cache \
1414
freetype freetype-dev ffmpeg gettext gettext-dev gmp-dev icu-dev imap imagemagick libzip \
1515
imagemagick-dev icu-libs imap-dev krb5-dev libc-dev libjpeg-turbo-dev libpng-dev libtool gmp libxslt \
1616
libwebp-dev libxml2-dev libxpm-dev libxslt-dev libzip-dev libintl libjpeg-turbo libpng libpq libxpm \
17-
openssl-dev make mysql-client pkgconf pcre-dev x264-dev zlib-dev tzdata
17+
openssl-dev make mysql-client nasm pkgconf pcre-dev x264-dev zlib-dev tzdata
1818

1919
# Configure and install PHP extensions
2020
RUN ln -s /usr/lib/$(apk --print-arch)-linux-gnu/libXpm.* /usr/lib/ && \

makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,28 @@
22
REGISTRY ?= k90mirzaei/php
33
VERSION ?= latest
44

5+
CHANGED_DIRS = $(shell git diff --name-only HEAD~1 HEAD | grep '^fpm-alpine/' | cut -d '/' -f 2 | sort | uniq)
6+
57
all: build push
68

7-
build: ## Build all images
9+
build: ## Build only changed images
810
- @echo "Building..."
9-
- @for dir in $(shell find ./fpm-alpine -mindepth 1 -maxdepth 1 -type d); do \
10-
version=$$(basename $$dir); \
11-
echo "Building image for version $$version..."; \
12-
docker build $$dir -t $(REGISTRY):$$version-$(VERSION); \
11+
- @for dir in $(CHANGED_DIRS); do \
12+
if [ -d ./fpm-alpine/$$dir ]; then \
13+
echo "Building image for version $$dir..."; \
14+
docker build ./fpm-alpine/$$dir -t $(REGISTRY):$$dir-$(VERSION); \
15+
fi \
1316
done
1417

15-
push: ## Push all images to github repo
18+
push: ## Push only changed images to GitHub repo
1619
- @echo "Pushing..."
17-
- @for dir in $(shell find ./fpm-alpine -mindepth 1 -maxdepth 1 -type d); do \
18-
version=$$(basename $$dir); \
19-
echo "Pushing image for version $$version..."; \
20-
docker push $(REGISTRY):$$version-$(VERSION); \
20+
- @for dir in $(CHANGED_DIRS); do \
21+
if [ -d ./fpm-alpine/$$dir ]; then \
22+
echo "Pushing image for version $$dir..."; \
23+
docker push $(REGISTRY):$$dir-$(VERSION); \
24+
fi \
2125
done
2226

23-
2427
help: ## Show makefile helper
2528
- @printf '\e[1;33m%-6s\e[m' "Makefile available commands"
2629
- @echo ''

0 commit comments

Comments
 (0)