Skip to content

Commit

Permalink
Merge pull request #431 from syerad/feature/use_current_stable_nginx_…
Browse files Browse the repository at this point in the history 
…version

Feature/use current stable nginx version
  • Loading branch information
@htuscher
htuscher committed Dec 16, 2021
2 parents 40b58cc + 7e9a374 commit a6d8c17
Show file tree
Hide file tree
Showing 18 changed files with 76 additions and 26 deletions.
16 changes: 8 additions & 8 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ full: provision build
all: build

build:
python ./bin/console docker:build --threads=auto
python2 ./bin/console docker:build --threads=auto

bootstrap: webdevops/bootstrap webdevops/ansible
base: webdevops/base webdevops/base-app webdevops/storage
Expand All @@ -40,20 +40,20 @@ requirements:
cd tests/serverspec && bundle install --path=vendor

test:
python bin/console test:serverspec --threads=auto -v
python2 bin/console test:serverspec --threads=auto -v

provision:
python bin/console generate:dockerfile
python bin/console generate:provision
python2 bin/console generate:dockerfile
python2 bin/console generate:provision

push:
python ./bin/console docker:push --threads=auto
python2 ./bin/console docker:push --threads=auto

graph:
python ./bin/console generate:graph
python2 ./bin/console generate:graph

graph-full:
python ./bin/console generate:graph --all\
python2 ./bin/console generate:graph --all\
--filename docker-image-full-layout.gv

documentation:
Expand All @@ -65,4 +65,4 @@ documentation:
--poll -H 0.0.0.0 /opt/docs html

webdevops/%:
python ./bin/console docker:build --threads=auto --whitelist=$@
python2 ./bin/console docker:build --threads=auto --whitelist=$@
5 changes: 4 additions & 1 deletion docker/nginx/debian-10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/nginx/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/nginx/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/nginx/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/5.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/7.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/debian-10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/debian-7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/debian-8-php7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/debian-8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
5 changes: 4 additions & 1 deletion docker/php-nginx/debian-9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,11 @@ COPY conf/ /opt/docker/

RUN set -x \
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx \
nginx \
&& docker-run-bootstrap \
&& docker-image-cleanup

Expand Down
6 changes: 4 additions & 2 deletions template/Dockerfile/images/nginx.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@
nginx
{%- endmacro %}


{% macro debian(role='') -%}
# Install nginx
&& printf "deb http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx\n deb-src http://nginx.org/packages/debian/ $(docker-image-info dist-codename) nginx" \
>> /etc/apt/sources.list \
&& curl -L https://nginx.org/keys/nginx_signing.key | apt-key add - \
&& apt-install \
nginx
nginx
{%- endmacro %}


Expand Down

0 comments on commit a6d8c17

Please sign in to comment.