Merge branch 'develop' into staging · acd8889a93 - Meramo Digital Division

Merge branch 'develop' into staging

* develop:
  update base image

ksieren 2 years ago

parent

335593f3a8 f9ed7d4f28

commit

acd8889a93

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
Dockerfile
							 
								View File
							
				@@ -1,4 +1,4 @@
			
				-FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-20
			
				+FROM kerstinsieren/alpine-phpfpm-nginx-baseimage:php74-21
			
				 ENV TZ=Europe/Berlin
			
				 WORKDIR /var/www/html