Skip to content
Snippets Groups Projects
Commit aa45e682 authored by Sergio Vier's avatar Sergio Vier :mountain_bicyclist_tone1:
Browse files

Ajustes varios Dockerfile

parent 1562dfee
No related branches found
No related tags found
1 merge request!171Ajustes varios Dockerfile
Pipeline #3085 passed with warnings with stages
in 4 minutes and 1 second
......@@ -3,7 +3,8 @@
## CHANGELOG
[CURRENT](/../compare/master...develop)
* Permite rechazar una solicitud estado "Procesando" o en procesamiento
* Issue #138: Permite rechazar una solicitud estado "Procesando" o en procesamiento
* Issue #137: Corrige configuración de TIMEZONE en PHP (mostraba mal la hora en el backend)
* Se migra version de toba 3.0.30 -> 3.2.4
* Soporte para Araí
* Integración inicial del instalador, docker-builder
......@@ -42,8 +42,6 @@ RUN bash ./docker/api-backend/entrypoint.sh --fix-permissions
FROM siutoba/php:8.1-alpine-2 as dev
MAINTAINER sistemas@campus.unam.edu.ar
RUN apk --no-cache add \
git vim nano php81-xmlreader php81-xmlwriter yarn php81-pecl-redis
......@@ -78,7 +76,7 @@ COPY --chown=apache:apache --from=src /usr/local/build /usr/local/app
########################################################################################################################
FROM ${APP} as final
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
RUN apk --no-cache add \
php81-ldap \
......@@ -93,6 +91,7 @@ WORKDIR /usr/local/app
COPY ./docker/api-backend/entrypoint.sh /
COPY ./api-backend/templates/vhost.conf /etc/apache2/conf.d/api.conf
RUN /setup_php_ini.sh /etc/php81/php.ini
RUN chmod +x /entrypoint.sh
RUN echo "ajustes de apache" \
......
......@@ -42,8 +42,6 @@ RUN bash ./docker/api-frontend/entrypoint.sh --fix-permissions
FROM siutoba/php:8.1-alpine-2 as dev
MAINTAINER sistemas@campus.unam.edu.ar
RUN apk --no-cache add \
git vim nano php81-xmlreader php81-xmlwriter yarn php81-pecl-redis php81-redis
......@@ -79,7 +77,7 @@ RUN rm -Rf composer-cache
########################################################################################################################
FROM ${APP} as final
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
RUN apk --no-cache add \
php81-ldap \
......@@ -93,6 +91,7 @@ WORKDIR /usr/local/app
COPY ./docker/api-frontend/entrypoint.sh /
COPY ./api-frontend/templates/vhost.conf /etc/apache2/conf.d/api.conf
RUN /setup_php_ini.sh /etc/php81/php.ini
RUN chmod +x /entrypoint.sh
RUN echo "ajustes de apache" \
......
......@@ -112,14 +112,14 @@ RUN echo "display_errors = On" >> /etc/php7/php.ini
#############################################################################
FROM ${APP} as final
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
WORKDIR /usr/local/app
COPY ./docker/backend/entrypoint.sh /
RUN /setup_php_ini.sh /etc/php7/php.ini
RUN echo "memory_limit = 1024M" >> /etc/php7/php.ini
RUN echo "upload_max_filesize = 10M" >> /etc/php7/php.ini
RUN chmod +x /entrypoint.sh
......
......@@ -55,7 +55,7 @@ CMD ["/bin/bash", "-c", "/usr/share/nginx/html/env.sh && nginx -g \"daemon off;\
# pull official base image
FROM node:13.12.0-alpine as dev
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
RUN apk --no-cache add \
git yarn vim bash
......
......@@ -36,8 +36,6 @@ RUN bash ./docker/visitas/entrypoint.sh --fix-permissions
FROM siutoba/php:7.4-alpine-3 as dev
MAINTAINER sistemas@campus.unam.edu.ar
RUN apk --no-cache add \
git vim nano php7-xmlreader php7-xmlwriter yarn php7-pecl-redis
......@@ -73,7 +71,7 @@ RUN php /usr/local/app/visitas/artisan storage:link
########################################################################################################################
FROM ${APP} as final
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
RUN apk --no-cache add \
php7-ldap \
......@@ -86,6 +84,7 @@ WORKDIR /usr/local/app
COPY ./docker/visitas/entrypoint.sh /
COPY ./visitas/templates/vhost.conf /etc/apache2/conf.d/visitas.conf
RUN /setup_php_ini.sh /etc/php7/php.ini
RUN chmod +x /entrypoint.sh
RUN echo "ajustes de apache" \
......
......@@ -60,12 +60,13 @@ FROM ${APP} as final
RUN apk --no-cache add php81-pecl-redis php81-sockets
MAINTAINER sistemas@campus.unam.edu.ar
LABEL org.opencontainers.image.authors="sistemas@unam.edu.ar"
WORKDIR /usr/local/app
COPY ./docker/worker/entrypoint.sh /
RUN /setup_php_ini.sh /etc/php81/php.ini
RUN chmod +x /entrypoint.sh
EXPOSE 80
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment