Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bf1eb19369 | ||
|
|
5f3eb5399e | ||
|
|
b14654d2a5 | ||
|
|
4d4a423a6c | ||
|
|
79db3c1fcf | ||
|
|
13ff5bafe7 | ||
|
|
5041afe20d | ||
|
|
40cf30d84e |
+5
-1
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
@@ -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" ]
|
||||
|
||||
Reference in New Issue
Block a user