Compare commits

...
Author SHA1 Message Date
marc bf1eb19369 yarn.lock
Docker build test / build-back (push) Canceled after 0s
Docker build test / build-front (push) Canceled after 0s
2022-12-12 18:09:56 +01:00
marc 5f3eb5399e dev no prod 2022-12-12 17:54:58 +01:00
marc b14654d2a5 back dockerfile fix 2022-12-12 17:49:20 +01:00
marc 4d4a423a6c no expose 2022-12-12 17:38:27 +01:00
marc 79db3c1fcf 127 2022-12-07 15:23:07 +01:00
marc 13ff5bafe7 localhost no sockets 2022-12-07 15:22:34 +01:00
marc 5041afe20d fix 2022-12-07 15:20:37 +01:00
marc 40cf30d84e mounting sockets 2022-12-07 15:18:51 +01:00
4 changed files with 11 additions and 6 deletions
+5 -1
View File
@@ -17,7 +17,11 @@ RUN docker-php-ext-install pdo_mysql gd zip
COPY --from=composer /usr/bin/composer /usr/bin/composer
# Enable apache conf
COPY docker/apache/numeris.conf /etc/apache2/sites-available/numeris.conf
RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && service apache2 restart
RUN a2dissite 000-default.conf && \
a2ensite numeris.conf && \
a2enmod headers && \
a2enmod rewrite && \
service apache2 restart
# Enable php conf
COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
+3
View File
@@ -24,10 +24,13 @@ services:
restart: unless-stopped
networks:
- mysql
ports:
- 127.0.0.1:3306:3306
env_file:
- .env
volumes:
- ./var/mysql:/var/lib/mysql
# - /var/run/mysqld:/var/run/mysqld
back:
image: numerisisep/numeris-back
-2
View File
@@ -50,8 +50,6 @@ services:
- /home/numeris/node_modules
links:
- back
expose:
- ${FRONT_PORT}
ports:
- ${FRONT_PORT}:${FRONT_PORT}
command: ng s --host 0.0.0.0
+3 -3
View File
@@ -1,9 +1,9 @@
FROM node:11.15.0 as builder
WORKDIR /opt/numeris
ENV PATH /opt/numeris/node_modules/.bin:$PATH
COPY package*.json /opt/numeris/
COPY package.json yarn.lock /opt/numeris/
RUN yarn install
RUN yarn add -g @angular/cli@7.3.9
# RUN yarn add -g @angular/cli@7.3.9
COPY . .
RUN yarn run build-prod
ENTRYPOINT [ "ng", "serve", "--configuration", "production", "--port", "80" ]
ENTRYPOINT [ "ng", "serve", "--port", "80" ]