Skip to content

Commit

Permalink
chore: Production test 3
Browse files Browse the repository at this point in the history
chore: Production test 3
  • Loading branch information
DestroyCom committed Sep 2, 2023
2 parents 34ea252 + 1261072 commit 5de1363
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
20 changes: 10 additions & 10 deletions .github/workflows/deploy_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
- develop
#- SERA-58
workflow_dispatch:

jobs:
cleaning:
uses: ./.github/workflows/rebuild-containers.yml
Expand Down Expand Up @@ -63,14 +63,14 @@ jobs:
#node:lts \
#npm install && npm run lint-autofix

- name: Execute composer install
run: |
docker run --rm \
-u "$(id -u):$(id -g)" \
-v $(pwd)/sera-back:/opt \
-w /opt \
laravelsail/php81-composer \
composer install --ignore-platform-reqs
#- name: Execute composer install
#run: |
#docker run --rm \
#-u "$(id -u):$(id -g)" \
#-v $(pwd)/sera-back:/opt \
#-w /opt \
#laravelsail/php81-composer \
#composer install --ignore-platform-reqs

- name: Launch the containers
run: |
Expand Down Expand Up @@ -99,7 +99,7 @@ jobs:
docker exec develop-sera-back-laravel-test php artisan l5-swagger:generate
- name: Run migrations$
# get all my env from secrets.DEVELOP_LARAVEL_ENV_FILE
# get all my env from secrets.DEVELOP_LARAVEL_ENV_FILE

run: |
sleep 10
Expand Down
2 changes: 1 addition & 1 deletion sera-back/docker/prod.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ RUN chown -R 1000:1000 /var/www/html && chmod -R 755 /var/www/html && chown -R 1
RUN mkdir -p /var/www/.mc && chown -R 1000:1000 /var/www/.mc && chmod -R 755 /var/www/.mc

# on copy les env de dev dans le container
COPY .env /var/www/html/.env
#COPY .env /var/www/html/.env

CMD ["apache2-foreground"]
4 changes: 2 additions & 2 deletions sera-front/src/pages/Projects.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const Projects = () => {
} = useQuery({
queryKey: ["projects", { page, status }],
queryFn: async () => {
let requestUrl = `api/projects?page=${page}&sort=desc`;
let requestUrl = `api/projects?page=${page}&sort=desc&maxPerPage=16`;
if (status != "0") requestUrl += `&status=${status}`;

const projects = await axios.get(requestUrl);
Expand Down Expand Up @@ -78,7 +78,7 @@ export const Projects = () => {
</TooltipProvider>
</div>
{!isLoading ? (
<div className="mx-4 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-3 lg:grid-cols-4">
<div className=" mx-4 grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4">
{projectsData.data.map(
(project: {
id: string;
Expand Down

0 comments on commit 5de1363

Please sign in to comment.