Compare commits

..
38 Commits
Author SHA1 Message Date
marc 351b16bdad messing with nginx
Test docker build / back-prod (push) Canceled after 0s
Test docker build / front-prod (push) Canceled after 0s
Test docker build / back-dev (push) Canceled after 0s
Test docker build / front-dev (push) Canceled after 0s
2022-12-23 23:57:45 +01:00
marc d468563877 Merge branch 'master' into staging 2022-12-23 22:19:35 +01:00
marc 955a720704 Merge branch 'master' into staging 2022-12-23 22:11:01 +01:00
marc f51bdd1079 Merge branch 'master' into staging 2022-12-23 22:04:04 +01:00
marc ba866f2740 staging 2022-12-23 19:50:59 +01:00
marc 241fd6fd8c Merge branch 'artisan' into staging 2022-12-22 19:59:24 +01:00
marc ce3983bf6a testing 2022-12-20 02:19:07 +01:00
marc 48f3fd0e49 8080 pls 2022-12-20 02:15:26 +01:00
marc 48ca638913 artisan all interfaces 2022-12-20 02:02:40 +01:00
marc d7e417cb98 artisan + dockerignore 2022-12-20 01:23:26 +01:00
marc 1a8e9b4736 Merge branch 'master' into staging 2022-12-16 20:42:46 +01:00
marc bff6efb724 Merge branch 'master' into staging 2022-12-16 00:22:26 +01:00
marc 6b94e02805 Merge branch 'master' into staging 2022-12-14 06:29:01 +01:00
marc 67da2a3b1b Merge branch 'master' into staging 2022-12-14 06:22:41 +01:00
marc 6cc1a490ee Merge branch 'master' into staging 2022-12-14 06:16:12 +01:00
marc a11fc66741 Merge branch 'master' into staging 2022-12-14 06:14:18 +01:00
marc 0c4ea7defc Merge branch 'master' into staging 2022-12-14 06:06:30 +01:00
marc adf9a355f2 Merge branch 'master' into staging 2022-12-14 06:01:41 +01:00
marc 3c9211afc1 Merge branch 'master' into staging 2022-12-14 05:58:16 +01:00
marc 097f7ec499 Merge branch 'master' into staging 2022-12-14 05:46:24 +01:00
marc f06687cc8e Merge branch 'master' into staging 2022-12-14 05:38:21 +01:00
marc 535b3a0353 lets test 2022-12-14 05:31:04 +01:00
marc dd1a5922fb Merge branch 'master' into staging 2022-12-14 05:10:38 +01:00
marc 4576c1129e Merge branch 'master' into staging 2022-12-14 05:06:45 +01:00
marc 78a3dde67e fix 2022-12-14 05:04:59 +01:00
marc 97d6b7c3f6 Merge branch 'master' into staging 2022-12-14 05:02:02 +01:00
marc 935531cc2d Merge branch 'master' into staging 2022-12-14 05:01:16 +01:00
marc 98c2959242 Merge branch 'master' into staging 2022-12-14 04:53:47 +01:00
marc 88cfeae153 Merge branch 'master' into staging 2022-12-14 04:39:08 +01:00
marc a8950813fd Merge branch 'master' into staging 2022-12-14 04:34:28 +01:00
marc 261309f2cb Merge branch 'master' into staging 2022-12-14 04:23:09 +01:00
marc 0eb934dad7 Merge branch 'master' into staging 2022-12-13 16:05:46 +01:00
marc b0bb350c3c Merge branch 'master' into staging 2022-12-13 15:56:54 +01:00
marc 8c383add3a Merge branch 'master' into staging 2022-12-13 15:40:55 +01:00
marc 39a50ad2a4 Merge branch 'master' into staging 2022-12-13 15:25:15 +01:00
marc fd4f021eec Merge branch 'master' into staging 2022-12-12 19:55:37 +01:00
marc cde020e710 build and push 2022-12-12 18:39:48 +01:00
marc fe106b43ca back and front staging 2022-12-12 18:35:20 +01:00
6 changed files with 13 additions and 8 deletions
+2 -2
View File
@@ -9,7 +9,7 @@ on:
jobs:
build-front:
name: Build front
name: Build and push front
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
@@ -38,7 +38,7 @@ jobs:
cache-to: type=gha
build-back:
name: Build back
name: Build and push back
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
+2
View File
@@ -1,3 +1,5 @@
Dockerfile
Dockerfile.production
.DS_Store
vendor
public/storage
+2 -1
View File
@@ -38,4 +38,5 @@ 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" ]
# ENTRYPOINT [ "/home/numeris/entrypoint.sh" ]
ENTRYPOINT ["php", "artisan", "serve", "--host", "0.0.0.0", "--port", "8080"]
-2
View File
@@ -69,7 +69,6 @@ services:
front:
image: numerisisep/numeris-front:prod
container_name: numeris_front
restart: unless-stopped
networks:
- caddy
labels:
@@ -97,7 +96,6 @@ services:
front-staging:
image: numerisisep/numeris-front:staging
container_name: numeris_front_staging
restart: unless-stopped
networks:
- caddy
labels:
+3 -3
View File
@@ -15,7 +15,7 @@ services:
image: mysql:5.7
container_name: numeris_mysql
environment:
MYSQL_DATABASE: 'numeris'
MYSQL_DATABASE: 'numeris_testing'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
back:
@@ -27,9 +27,9 @@ services:
environment:
DB_HOST: mysql
DB_PORT: 3306
DB_DATABASE: numeris
DB_DATABASE: numeris_testing
DB_USERNAME: root
DB_PASSWORD: ""
DB_PASSWORD:
volumes:
- ./back:/home/numeris
- /home/numeris/vendor
+4
View File
@@ -10,5 +10,9 @@ server {
index index.html;
location / {
try_files $uri $uri/ /index.html;
# types { application/octet-stream .pdf; }
}
location ~* \.pdf$ {
add_header Content-disposition "attachment; filename=$1";
}
}