Compare commits

..
16 Commits
Author SHA1 Message Date
marc 09f6858326 external true 2022-10-03 20:23:36 +02:00
marc 6d3fc1b774 bye 2022-10-03 20:21:49 +02:00
marc 326cce6fd8 image 2022-10-03 20:18:46 +02:00
marc 1f9a0b1bb9 var run docker 2022-10-03 20:16:31 +02:00
marc 4d6fe9941b dash 2022-10-03 19:45:44 +02:00
marc 418de3d52d fix conflict 2022-10-03 19:40:51 +02:00
marc b7c51c7f3c production 2022-09-21 16:48:27 +02:00
marc 6c60e3792c image names even though they point towards nothing 2022-09-20 16:11:03 +02:00
marc 140fb1d7d8 3.9 2022-09-20 15:44:48 +02:00
marc b54c69ae4c names are back 2022-09-20 15:18:09 +02:00
marc ce259181b9 mysql_testing 2022-09-20 14:38:33 +02:00
marc 77ca1911ed bind mount is back 2022-09-20 14:36:31 +02:00
marc 5e3dfec004 phpmyadmin might come in handy 2022-09-19 10:32:09 +02:00
marc b834f1d27b fix names 2022-09-19 10:27:59 +02:00
marc 3a374a10bc front too 2022-09-17 17:51:40 +02:00
marc 0378a0a224 front too 2022-09-16 19:54:08 +02:00
7 changed files with 971 additions and 2368 deletions
+8 -7
View File
@@ -1,4 +1,6 @@
FROM php:7.4-apache
FROM php:7.2-apache
RUN mkdir -p /home/numeris
# Install packages
RUN apt-get update && apt-get install -y \
@@ -6,9 +8,7 @@ RUN apt-get update && apt-get install -y \
zip \
unzip \
nano \
libpng-dev \
libzip-dev
libpng-dev
# Install the PHP mcrypt pdo_mysql extension
RUN docker-php-ext-install pdo_mysql gd zip
@@ -21,17 +21,18 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
# Enable php conf
COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
WORKDIR /home/numeris
COPY . .
COPY . /home/numeris
# Composer install
WORKDIR /home/numeris
RUN composer install --no-interaction
# Final touch
RUN . ~/.bashrc
RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN usermod -u 1000 www-data
RUN chown -R www-data:www-data /home/numeris
RUN chown -R www-data:www-data /var/log/apache2/
ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]
WORKDIR /home/numeris
+9 -7
View File
@@ -1,4 +1,6 @@
FROM php:7.4-apache
FROM php:7.2-apache
RUN mkdir -p /home/numeris
# Install packages
RUN apt-get update && apt-get install -y \
@@ -6,8 +8,7 @@ RUN apt-get update && apt-get install -y \
zip \
unzip \
nano \
libpng-dev \
libzip-dev
libpng-dev
# Install the PHP mcrypt pdo_mysql extension
RUN docker-php-ext-install pdo_mysql gd zip
@@ -19,20 +20,21 @@ RUN a2dissite 000-default.conf && a2ensite numeris.conf && a2enmod rewrite && se
# Enable php conf
COPY docker/php/php.ini /usr/local/etc/php/conf.d/default.ini
WORKDIR /home/numeris
COPY . .
COPY . /home/numeris
### Back config ###
WORKDIR /home/numeris
RUN composer install --optimize-autoloader --no-dev --no-interaction
# Final touch
RUN . ~/.bashrc
RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN usermod -u 1000 www-data
RUN chown -R www-data:www-data /home/numeris
RUN chown -R www-data:www-data /var/log/apache2/
WORKDIR /home/numeris
RUN php artisan config:cache
RUN php artisan route:cache
ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]
+870 -2334
View File
File diff suppressed because it is too large Load Diff
-8
View File
@@ -1,8 +0,0 @@
#!/usr/bin/env sh
php artisan key:generate --force
php artisan jwt:secret --force
php artisan migrate:refresh --seed --force
docker-php-entrypoint
apache2-foreground
+50 -6
View File
@@ -3,32 +3,76 @@ services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
restart: unless-stopped
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
networks:
- caddy
- mysql
labels:
caddy: phpmyadmin.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 80}}"
mysql:
image: mysql:5.7
container_name: numeris_mysql
restart: unless-stopped
networks:
- mysql
env_file:
- .env
volumes:
- mysql:/var/lib/mysql
- ./var/mysql:/var/lib/mysql
back:
container_name: numeris_back
restart: unless-stopped
build:
context: ./back
dockerfile: Dockerfile
dockerfile: Dockerfile.production
networks:
- caddy
- mysql
env_file:
- .env
links:
- mysql
depends_on:
- mysql
front:
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
networks:
- caddy
depends_on:
- back
labels:
caddy: numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 4200}}"
caddy:
image: lucaslorentz/caddy-docker-proxy:ci-alpine
restart: unless-stopped
ports:
- "80:80"
- "443:443"
volumes:
# docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
- /var/run/docker.sock:/var/run/docker.sock
- caddy_data:/data
networks:
- caddy
healthcheck:
test: ["CMD", "curl", "-f", "localhost:80"]
networks:
caddy:
external: true
mysql:
volumes:
mysql:
+29 -3
View File
@@ -1,14 +1,28 @@
version: '3'
version: "3.9"
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
volumes:
- ./var/mysql_testing:/var/lib/mysql
mysql:
image: mysql:5.7
container_name: numeris_mysql
environment:
MYSQL_DATABASE: 'numeris_testing'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
container_name: numeris_mysql
back:
image: numeris-back
container_name: numeris_back
build:
context: ./back
dockerfile: Dockerfile
@@ -25,4 +39,16 @@ services:
- mysql
depends_on:
- mysql
container_name: numeris_back
front:
image: numeris-front
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
ports:
- 4200:4200
links:
- back
depends_on:
- back
+5 -3
View File
@@ -1,16 +1,18 @@
FROM node:11.15.0
WORKDIR /home/numeris
RUN mkdir -p /home/numeris
ENV PATH /home/numeris/node_modules/.bin:$PATH
COPY package*.json /home/numeris/
# npm install
WORKDIR /home/numeris
RUN npm install
RUN npm install -g @angular/cli@7.3.9
COPY . .
COPY . /home/numeris
RUN npm rebuild node-sass
ENTRYPOINT [ "ng", "s", "--host", "0.0.0.0" ]
WORKDIR /home/numeris