mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-25 10:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Use new compose command

Browse source
This commit is contained in:
Yassine Guedidi 2024-11-19 22:09:56 +01:00
parent 0e836a3d87
commit 74a2a08232
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/CONTRIBUTING.md vendored
View file

@ -7,11 +7,11 @@
- Clone the repository - Clone the repository
- Ensure your Docker daemon is running - Ensure your Docker daemon is running
- Copy `docker/php/env.example` to `docker/php/env` and customize - Copy `docker/php/env.example` to `docker/php/env` and customize
- Launch `docker-compose run --rm php composer install` to bootstrap php dependencies - Launch `docker compose run --rm php composer install` to bootstrap php dependencies
- Launch `docker-compose run --rm php bin/console wallabag:install` to bootstrap your installation - Launch `docker compose run --rm php bin/console wallabag:install` to bootstrap your installation
- Launch `docker-compose run --rm php yarn install` to bootstrap dependencies for the frontend - Launch `docker compose run --rm php yarn install` to bootstrap dependencies for the frontend
- Launch `docker-compose run --rm php yarn build:dev` to build assets for the frontend - Launch `docker compose run --rm php yarn build:dev` to build assets for the frontend
- Launch `docker-compose up -d` to start the stack - Launch `docker compose up -d` to start the stack
You'll then have: You'll then have:
- a PHP daemon with standalone web server - a PHP daemon with standalone web server

2
GNUmakefile
View file

@ -11,7 +11,7 @@ else
override ENV = prod override ENV = prod
endif endif
DOCKER_COMPOSE_RUNNING := $(shell docker-compose ps -q | grep -q . && echo 1 || echo 0) DOCKER_COMPOSE_RUNNING := $(shell docker compose ps -q | grep -q . && echo 1 || echo 0)
ifeq ($(DOCKER_COMPOSE_RUNNING), 1) ifeq ($(DOCKER_COMPOSE_RUNNING), 1)
PHP := docker compose run --rm php php PHP := docker compose run --rm php php

2
app/config/parameters.yml.dist
View file

@ -1,7 +1,7 @@
# This file is a "template" of what your parameters.yml file should look like # This file is a "template" of what your parameters.yml file should look like
parameters: parameters:
# Uncomment these settings or manually update your parameters.yml # Uncomment these settings or manually update your parameters.yml
# to use docker-compose # to use Docker Compose
# #
# database_driver: %env.database_driver% # database_driver: %env.database_driver%
# database_host: %env.database_host% # database_host: %env.database_host%