Docker file move from COPY to ADD (sec recomendations)
This commit is contained in:
22
Dockerfile
22
Dockerfile
@@ -224,11 +224,11 @@ RUN echo @testing http://nl.alpinelinux.org/alpine/edge/testing >> /etc/apk/repo
|
||||
# apk del .sys-deps
|
||||
# ln -s /usr/bin/php7 /usr/bin/php
|
||||
|
||||
ADD conf/supervisord.conf /etc/supervisord.conf
|
||||
COPY conf/supervisord.conf /etc/supervisord.conf
|
||||
|
||||
# Copy our nginx config
|
||||
RUN rm -Rf /etc/nginx/nginx.conf
|
||||
ADD conf/nginx.conf /etc/nginx/nginx.conf
|
||||
COPY conf/nginx.conf /etc/nginx/nginx.conf
|
||||
|
||||
# nginx site conf
|
||||
RUN mkdir -p /etc/nginx/sites-available/ && \
|
||||
@@ -236,8 +236,8 @@ mkdir -p /etc/nginx/sites-enabled/ && \
|
||||
mkdir -p /etc/nginx/ssl/ && \
|
||||
rm -Rf /var/www/* && \
|
||||
mkdir /var/www/html/
|
||||
ADD conf/nginx-site.conf /etc/nginx/sites-available/default.conf
|
||||
ADD conf/nginx-site-ssl.conf /etc/nginx/sites-available/default-ssl.conf
|
||||
COPY conf/nginx-site.conf /etc/nginx/sites-available/default.conf
|
||||
COPY conf/nginx-site-ssl.conf /etc/nginx/sites-available/default-ssl.conf
|
||||
RUN ln -s /etc/nginx/sites-available/default.conf /etc/nginx/sites-enabled/default.conf
|
||||
|
||||
## disabled due to license changes (to fix in next release)
|
||||
@@ -273,16 +273,16 @@ RUN echo "cgi.fix_pathinfo=0" > ${php_vars} &&\
|
||||
|
||||
|
||||
# Add Scripts
|
||||
ADD scripts/start.sh /start.sh
|
||||
ADD scripts/pull /usr/bin/pull
|
||||
ADD scripts/push /usr/bin/push
|
||||
ADD scripts/letsencrypt-setup /usr/bin/letsencrypt-setup
|
||||
ADD scripts/letsencrypt-renew /usr/bin/letsencrypt-renew
|
||||
COPY scripts/start.sh /start.sh
|
||||
COPY scripts/pull /usr/bin/pull
|
||||
COPY scripts/push /usr/bin/push
|
||||
COPY scripts/letsencrypt-setup /usr/bin/letsencrypt-setup
|
||||
COPY scripts/letsencrypt-renew /usr/bin/letsencrypt-renew
|
||||
RUN chmod 755 /usr/bin/pull && chmod 755 /usr/bin/push && chmod 755 /usr/bin/letsencrypt-setup && chmod 755 /usr/bin/letsencrypt-renew && chmod 755 /start.sh
|
||||
|
||||
# copy in code
|
||||
ADD src/ /var/www/html/
|
||||
ADD errors/ /var/www/errors
|
||||
COPY src/ /var/www/html/
|
||||
COPY errors/ /var/www/errors
|
||||
|
||||
|
||||
EXPOSE 443 80
|
||||
|
||||
@@ -12,7 +12,7 @@ If you have improvements or suggestions please open an issue or pull request on
|
||||
### Versioning
|
||||
| Docker Tag | Git Release | Nginx Version | PHP Version | Alpine Version |
|
||||
|-----|-------|-----|--------|--------|
|
||||
| latest/1.10.1 | Master Branch |1.18.0 | 7.4.9 | 3.12 |
|
||||
| latest/1.10.2 | Master Branch |1.18.0 | 7.4.9 | 3.12 |
|
||||
|
||||
|
||||
_Note:_ The image is now aviable on x86_64 and Arm systems!
|
||||
|
||||
@@ -20,7 +20,8 @@ The latest tag will always follow the master branch in git. the other versions w
|
||||
| 1.9.0 | 7.4.2 |1.16.1 | 3.11 | 0.3.13 | upgrade to PHP 7.4.2 |
|
||||
| 1.9.1 | 7.4.5 |1.16.1 | 3.11 | 0.3.13 | upgrade to PHP 7.4.5 |
|
||||
| 1.10.0 | 7.4.8 |1.18.0 | 3.12 | 0.3.13 | PHP 7.4.8 + Nginx 1.18.0 + arm builds |
|
||||
| 1.10.0 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | bump to PHP 7.4.9 |
|
||||
| 1.10.1 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | bump to PHP 7.4.9 |
|
||||
| 1.10.2 | 7.4.9 |1.18.0 | 3.12 | 0.3.13 | Swap Docker file from ADD to COPY |
|
||||
|
||||
These tags will be created on GitLab and as tags in docker hub.
|
||||
|
||||
|
||||
Reference in New Issue
Block a user