Skip to content

Commit ecbdc3e

Browse files
committed
Remove punctuation and add EXTRAVERSION to Makefile
1 parent 11a3666 commit ecbdc3e

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

Dockerfile

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ ENV \
55
PHP_VERSION=7.0.13
66

77
RUN \
8-
# Install tools, required for building.
8+
# Install tools, required for building
99
apt-get update && \
1010
apt-get install -y \
1111
# In general...
@@ -27,19 +27,19 @@ RUN \
2727
pkg-config \
2828
re2c && \
2929

30-
# Prepare for building.
30+
# Prepare for building
3131
mkdir -p /tmp/build
3232

3333
RUN \
3434
mkdir -p /tmp/build/nginx/ && \
3535
cd /tmp/build/nginx && \
3636

37-
# Download Nginx.
37+
# Download Nginx
3838
curl -SLO https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz
3939

4040
RUN \
4141
cd /tmp/build/nginx && \
42-
# Verify signature.
42+
# Verify signature
4343
curl -SLO https://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz.asc && \
4444
curl -SLO https://nginx.org/keys/nginx_signing.key && \
4545
gpg --import nginx_signing.key && \
@@ -57,12 +57,12 @@ RUN \
5757

5858
RUN \
5959
cd /tmp/build/nginx && \
60-
# Unpack tarball.
60+
# Unpack tarball
6161
tar -xvzf nginx-${NGINX_VERSION}.tar.gz
6262

6363
RUN \
6464
cd /tmp/build/nginx/nginx-${NGINX_VERSION} && \
65-
# Run configuration.
65+
# Run configuration
6666
./configure \
6767
--with-file-aio \
6868
--with-http_gunzip_module \
@@ -75,7 +75,7 @@ RUN \
7575

7676
RUN \
7777
cd /tmp/build/nginx/nginx-${NGINX_VERSION} && \
78-
# Start compiling and installing.
78+
# Start compiling and installing
7979
make -j$(nproc) build && \
8080
make modules && \
8181
make install
@@ -84,20 +84,20 @@ RUN \
8484
mkdir -p /tmp/build/php/ && \
8585
cd /tmp/build/php && \
8686

87-
# Download PHP.
87+
# Download PHP
8888
curl -SLo php-${PHP_VERSION}.tar.gz http://ch1.php.net/get/php-${PHP_VERSION}.tar.gz/from/this/mirror
8989

9090
# RUN \
9191
# TODO SIG VERIFICATION!!!
9292

9393
RUN \
9494
cd /tmp/build/php && \
95-
# Unpack tarball.
95+
# Unpack tarball
9696
tar -xvzf php-${PHP_VERSION}.tar.gz
9797

9898
RUN \
9999
cd /tmp/build/php/php-${PHP_VERSION} && \
100-
# Run configuration.
100+
# Run configuration
101101
./configure \
102102
--enable-fpm \
103103
--enable-mbregex \

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
REPO = rtucek
22
IMAGE = nginx-php
3-
VERSION = 0.1.0
3+
VERSION = 1.0.0
4+
EXTRAVERSION = -unreleased-wip
45

5-
IMAGE_FQN = $(REPO)/$(IMAGE):$(VERSION)
6+
IMAGE_FQN = $(REPO)/$(IMAGE):$(VERSION)$(EXTRAVERSION)
67

78
.PHONY: build
89

0 commit comments

Comments
 (0)