Skip to content

Commit

Permalink
Merge branch 'develop' for v4.7.5
Browse files Browse the repository at this point in the history
  • Loading branch information
mrrobot47 committed Oct 8, 2024
2 parents 352e11d + 0bf66ef commit 37dd22c
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion nginx-proxy/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jwilder/nginx-proxy:1.6.1
FROM jwilder/nginx-proxy:1.6.2
LABEL org.label-schema.schema-version="1.0.0"
LABEL org.label-schema.vendor="EasyEngine"
LABEL org.label-schema.name="nginx-proxy"
Expand Down
2 changes: 2 additions & 0 deletions nginx/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ LABEL org.label-schema.name="nginx"
RUN mkdir -p /var/log/nginx; \
mkdir -p /usr/local/openresty/nginx/conf/conf.d
COPY conf /usr/local/openresty/nginx/conf
COPY bashrc /root/.bashrc
WORKDIR /var/www/htdocs
EXPOSE 80
2 changes: 2 additions & 0 deletions nginx/bashrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
PS1="\`if [ \$? = 0 ]; then echo \[\e[37m\]^_^[\u@$VIRTUAL_HOST:\w]\\$ \[\e[0m\]; else echo \[\e[31m\]O_O[\u@$VIRTUAL_HOST:\w]\\$ \[\e[0m\]; fi\`"
export HISTTIMEFORMAT="%d/%m/%y %T "
2 changes: 1 addition & 1 deletion php/8.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.1.29-fpm
FROM php:8.1.30-fpm

LABEL maintainer="Riddhesh Sanghvi <[email protected]>, Devarshi Sathiya <[email protected]>"
LABEL org.label-schema.schema-version="1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion php/8.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.2.23-fpm
FROM php:8.2.24-fpm

LABEL maintainer="Riddhesh Sanghvi <[email protected]>, Devarshi Sathiya <[email protected]>"
LABEL org.label-schema.schema-version="1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion php/8.3/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM php:8.3.11-fpm
FROM php:8.3.12-fpm

LABEL maintainer="Riddhesh Sanghvi <[email protected]>, Devarshi Sathiya <[email protected]>"
LABEL org.label-schema.schema-version="1.0.0"
Expand Down

0 comments on commit 37dd22c

Please sign in to comment.