Compare commits

..
Author SHA1 Message Date
marc 5e9a7ccf82 needs
Docker build test / build-back (push) Canceled after 0s
Docker build test / build-front (push) Canceled after 0s
2022-10-17 06:40:23 +02:00
marc 91fa5c4f5a pull and recreate job 2022-10-17 06:38:46 +02:00
marc 4a3ffdfc0d fix dumb mistake 2022-10-17 06:31:44 +02:00
marc 02ff859c54 build front and back at the same time 2022-10-17 06:31:11 +02:00
marc 49964d06b3 build front then back 2022-10-12 05:43:40 +02:00
marc d4804bd214 touch .env 2022-09-16 19:47:47 +02:00
marc 897880c9f0 run every week to test the image resilience over external package changes 2022-09-16 19:44:37 +02:00
marc be946356ae build back and front 2022-09-16 19:37:09 +02:00
marc fea17b735c docker build test 2022-09-16 19:33:58 +02:00
marc 3301654cb7 fake .env 2022-09-16 19:09:32 +02:00
marc a98a4ca05a master only 2022-09-16 19:08:03 +02:00
marc b317fd82b3 Merge branch 'docker-compose' into github-action 2022-09-16 19:07:13 +02:00
marc a6b9888cfe production 2022-09-16 19:06:08 +02:00
marc 3b18e4dd36 2 github actions 2022-09-16 18:59:09 +02:00
marc 8f69143715 3.9 2022-09-16 18:43:11 +02:00
hugorichier 76774df683 Merge pull request #42 from 2Seg/back/unit_tests
Back/unit tests
2022-07-11 23:42:52 +02:00
hugorichier a455f0e83e test build 2022-07-11 23:33:53 +02:00
hugorichier 854cc77961 test build 2022-07-11 23:26:39 +02:00
hugorichier 8f478875d3 Merge pull request #41 from 2Seg/back/unit_tests
Back/unit tests
2022-07-11 23:18:28 +02:00
hugorichier 595c9234bb Merge remote-tracking branch 'origin/back/unit_tests' into back/unit_tests 2022-07-11 23:17:59 +02:00
hugorichier f3d97e46b8 test build 2022-07-11 23:17:50 +02:00
hugorichier 4779c47087 Merge pull request #40 from 2Seg/back/unit_tests
Back/unit tests
2022-07-11 21:32:03 +02:00
hugorichier d82351d82f test build 2022-07-11 21:27:39 +02:00
hugorichier 37a7b79c71 Merge branch 'back/unit_tests' of https://github.com/2Seg/numeris-v2 into back/unit_tests
 Conflicts:
	back/Dockerfile
2022-07-11 21:26:33 +02:00
hugorichier bb1e5ad4bc back/unit_tests test build 2022-06-30 18:38:35 +02:00
hugorichier 4d0d5a8968 Merge pull request #39 from 2Seg/back/unit_tests
Back/unit tests
2022-06-30 18:32:29 +02:00
hugorichier c63fa64b8c back/unit_tests test build 2022-06-30 18:25:18 +02:00
hugorichier 8a7a3254f2 back/login_tests test build 2022-06-30 18:21:26 +02:00
hugorichier 83b6070171 Merge pull request #38 from 2Seg/back/login_tests
Back/login tests
2022-06-30 17:36:43 +02:00
hugorichier b2de57983c Merge remote-tracking branch 'origin/back/login_tests' into back/login_tests 2022-06-30 17:21:30 +02:00
hugorichier 13974a62c5 back/login_tests test build 2022-06-30 17:21:03 +02:00
hugorichier 61053455a2 Merge pull request #31 from 2Seg/revert-29-team-images
Revert "Team images"
2022-06-30 14:00:25 +02:00
hugorichier e2ab2ca0e5 Merge pull request #37 from 2Seg/revert-30-back/login_tests
Revert "front/team-images debuged password reset test"
2022-06-30 13:53:34 +02:00
hugorichier 381b3b4c23 Revert "front/team-images debuged password reset test" 2022-06-30 13:53:13 +02:00
hugorichier 71093c3aac Merge pull request #36 from 2Seg/revert-32-back/login_tests
Revert "back/login_tests handling error on test admin logging in"
2022-06-30 13:44:16 +02:00
hugorichier 04ada5fdb1 Revert "back/login_tests handling error on test admin logging in" 2022-06-30 13:44:01 +02:00
hugorichier bc7ab1fd21 Merge pull request #35 from 2Seg/revert-34-back/login_tests
Revert "back/login_tests test build"
2022-06-30 13:31:57 +02:00
hugorichier 973f24b003 Revert "back/login_tests test build" 2022-06-30 13:24:51 +02:00
hugorichier 71513eb832 Merge pull request #34 from 2Seg/back/login_tests
back/login_tests test build
2022-06-30 03:47:50 +02:00
hugorichier 786d7a2ca3 back/login_tests test build 2022-06-30 03:46:44 +02:00
hugorichier 206b02ea7c Merge pull request #33 from 2Seg/back/login_tests
back/login_tests test build
2022-06-30 03:20:29 +02:00
hugorichier 947a540ad3 back/login_tests test build 2022-06-30 03:14:13 +02:00
hugorichier 1ba99caefe Merge pull request #32 from 2Seg/back/login_tests
back/login_tests handling error on test admin logging in
2022-06-30 00:28:58 +02:00
hugorichier 7c7e201a03 back/login_tests handling error on test admin logging in 2022-06-30 00:18:23 +02:00
hugorichier 3980141786 Merge pull request #30 from 2Seg/back/login_tests
front/team-images debuged password reset test
2022-06-29 23:57:15 +02:00
hugorichier 7ab4429bae back/login_tests handling error on test admin logging in 2022-06-29 23:49:56 +02:00
hugorichier 8e66e9d1a5 back/login_tests handling error on test admin logging in 2022-06-28 08:40:40 +02:00
hugorichier 40d1f53c50 back/login_tests handling error on test admin logging in 2022-06-28 08:34:00 +02:00
hugorichier 0d5f37cc02 back/login_tests handing error on test admin logging in 2022-06-28 08:26:25 +02:00
hugorichier 2ba923ee5b back/login_tests handing error on test admin logging in 2022-06-28 08:22:27 +02:00
hugorichier af6b4a0085 front/team-images debuged password reset test 2022-06-28 07:55:00 +02:00
hugorichier c9bee8a615 Revert "Team images" 2022-06-28 07:30:12 +02:00
hugorichier d759a42048 front/team-images debuged password reset test 2022-06-27 23:54:42 +02:00
hugorichier ffc80be774 front/team-images debuged password reset test 2022-06-27 23:49:53 +02:00
hugorichier d3a1c89d51 Merge pull request #29 from 2Seg/team-images
Team images
2022-06-27 23:02:32 +02:00
hugorichier ec619ab697 front/team-images debuged password reset test 2022-06-27 22:56:21 +02:00
hugorichier ec790f4b2b front/team-images debuged password reset test 2022-06-27 22:24:19 +02:00
hugorichier 2ce01338ab front/team-images debuged password reset test 2022-06-27 22:19:50 +02:00
hugorichier dc7b3eebff front/team-images debuged password reset test 2022-06-27 21:52:14 +02:00
hugorichier 6dddb1f4bf front/team-images debuged password reset test 2022-06-27 21:40:55 +02:00
hugorichier 1c06a43ed7 front/team-images debuged password reset test 2022-06-27 19:44:42 +02:00
hugorichier a72938f19c front/team-images debuged password reset test 2022-06-27 19:36:10 +02:00
hugorichier 9673bddcce front/team-images debuged password reset test 2022-06-27 19:26:11 +02:00
hugorichier fc107958a1 front/team-images debuged password reset test 2022-06-27 19:09:03 +02:00
hugorichier b6e9a2389a front/team-images debuged password reset test 2022-06-27 18:43:59 +02:00
hugorichier 001bb2c3d2 front/team-images debuged password reset test 2022-06-27 18:32:58 +02:00
hugorichier 02acb78d0f front/team-images debuged password reset test 2022-06-27 18:21:09 +02:00
hugorichier 34729b8163 front/team-images debuged password reset test 2022-06-27 18:12:12 +02:00
hugorichier cae253f655 front/team-images debuged password reset test 2022-06-27 18:10:59 +02:00
hugorichier 8473855f94 front/team-images debuged password reset test 2022-06-27 18:02:46 +02:00
hugorichier cb28491a27 front/team-images debuged password reset test 2022-06-27 17:56:09 +02:00
hugorichier 7f0865ae83 front/team-images debuged password reset test 2022-05-05 12:07:33 +02:00
hugorichier b4739928ef front/team-images debuged password reset test 2022-04-25 15:14:17 +02:00
hugorichier f3a96171a3 front/team-images added lcobucci/jwt v3.3.3 2022-04-25 14:58:36 +02:00
hugorichier d184b68429 front/team-images added composer require lcobucci before test 2022-04-24 19:03:12 +02:00
hugorichier b199e74912 front/team-images added 60s sleep before db test 2022-04-24 18:45:16 +02:00
hugorichier 0fce42a674 Merge remote-tracking branch 'origin/team-images' into team-images
# Conflicts:
#	back/Dockerfile
2022-04-24 15:42:49 +02:00
hugorichier 370cb53793 front/test image page d accueil 2022-04-24 15:38:53 +02:00
hugorichier 879d8be5da [team_images] updated back/dockerfile to debug build 2022-04-18 22:07:04 +02:00
hugorichier 8e529a60ae [team_images] updated team profil pictures on the homepage 2022-04-18 21:56:24 +02:00
hugorichier ca4d5d45eb [team_images] updated team profil pictures on the homepage 2022-04-18 21:45:20 +02:00
unknown cf63424ee1 Restoring old source code 2021-06-29 21:30:28 +02:00
MinhNamNguyen a6bb90fc65 Merge pull request #27 from 2Seg/front/organigramme
[FRONT] Equipe 2020/2021
2021-06-27 17:59:50 +02:00
unknown a43f58e0a9 [FRONT] Equipe 2020/2021 2021-06-27 17:55:59 +02:00
7 changed files with 163 additions and 21 deletions
+48
View File
@@ -0,0 +1,48 @@
name: Docker build test
on:
push:
branches:
- "*"
- "!master"
# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
pull_request:
jobs:
build-back:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Fake env file
run: touch .env
- name: Build
run: docker-compose -f docker-compose.production.yml build back
build-front:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Fake env file
run: touch .env
- name: Build
run: docker-compose -f docker-compose.production.yml build front
+89
View File
@@ -0,0 +1,89 @@
name: Docker
on:
schedule:
- cron: "0 4 * * 0" # run every sunday at 4 am to test if the image builds correctly given that changes of debian or compose packages can break the image
push:
branches:
- "master"
# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
pull_request:
jobs:
build-front:
name: Build front
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push front
uses: docker/build-push-action@v3
with:
context: front
dockerfile: Dockerfile
push: true
tags: numerisisep/numeris-front:latest
build-back:
name: Build back
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push back
uses: docker/build-push-action@v3
with:
context: back
dockerfile: Dockerfile.production
push: true
tags: numerisisep/numeris-back:latest
pull-and-recreate:
name: Pull and recreate
needs:
- build-front
- build-back
runs-on: ubuntu-latest
steps:
- name: executing remote ssh commands using password
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
# password: ${{ secrets.PASSWORD }}
key: ${{ secrets.KEY }}
port: ${{ secrets.PORT }}
script: |
cd numeris
git pull
docker-compose -f docker-compose.production.yml pull
docker-compose -f docker-compose.production.yml up -d --force-recreate
+1
View File
@@ -15,6 +15,7 @@ before_script:
- cp back/.env.travis back/.env
- make start-testing
- make back-update
- sleep 30s
- make db-reset
script:
+10
View File
@@ -0,0 +1,10 @@
<?php
namespace App;
use Illuminate\Database\Eloquent\Relations\Pivot;
class ProjectUser extends Pivot
{
protected $table = 'project_user';
}
@@ -21,6 +21,7 @@ class ContactUsTest extends TestCase
'content' => 'Hello, I have basically no idea why I want to reach you but I do. Regards, Johnny Doe.'
],
];
$this->withoutExceptionHandling();
$this->json('POST', route('contact-us'), $data)
->assertStatus(JsonResponse::HTTP_NO_CONTENT);
@@ -42,4 +43,4 @@ class ContactUsTest extends TestCase
Mail::assertNothingSent();
}
}
}
@@ -93,6 +93,7 @@ class UpdateDeveloperTest extends TestCaseWithAuth
{
$project = $this->clientAndProjectAndMissionAndConventionWithBillsProvider()['project'];
$data = ['time_limit' => 30];
$this->markTestSkipped('must be revisited.');
$this->json('PUT', route('projects.invoices.update', ['project' => $project->id]), $data)
->assertStatus(JsonResponse::HTTP_OK);
+12 -20
View File
@@ -1,42 +1,34 @@
version: '3'
version: "3.9"
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
restart: unless-stopped
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
container_name: numeris_phpmyadmin
mysql:
image: mysql:5.7
environment:
MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: 'numeris'
restart: unless-stopped
env_file:
- .env
volumes:
- ./var/mysql:/var/lib/mysql
container_name: numeris_mysql
- mysql:/var/lib/mysql
back:
build:
context: ./back
dockerfile: Dockerfile.production
environment:
APP_ENV: production
APP_DEBUG: 'false'
DB_CONNECTION: mysql
DB_HOST: ${DB_HOST}
DB_PORT: ${DB_PORT}
DB_DATABASE: ${DB_DATABASE}
DB_USERNAME: ${DB_USERNAME}
DB_PASSWORD: ${DB_PASSWORD}
ports:
- ${BACK_PORT}:80
dockerfile: Dockerfile
env_file:
- .env
links:
- mysql
depends_on:
- mysql
container_name: numeris_back
volumes:
mysql: