-
Notifications
You must be signed in to change notification settings - Fork 3
Dockerize development #40
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
Capucinoxx
wants to merge
7
commits into
JDIS:master
Choose a base branch
from
Capucinoxx:feat/dockerize-development
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
8eb28e3
chore: add docker-compose
Capucinoxx b17f49e
chore: update contribution
Capucinoxx b36fdac
Update .github/CONTRIBUTING.md
Capucinoxx c1a9817
Update .github/CONTRIBUTING.md
Capucinoxx 08067f5
Update .github/CONTRIBUTING.md
Capucinoxx 86335d1
Update .github/CONTRIBUTING.md
Capucinoxx 7c1bb33
Update .github/CONTRIBUTING.md
Capucinoxx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| # Contribution au site JDIS | ||
|
|
||
| ## Démarrage rapide | ||
|
|
||
| 1. Forker le projet | ||
|  | ||
|
|
||
| 2. Cloner le dépôt forké | ||
| ```bash | ||
| git clone https://github.com/${your_username}/Website | ||
| ``` | ||
|
|
||
| 3. Configurer le dépôt distant (upstream) | ||
| ```bash | ||
| git remote add upstream https://github.com/JDIS/Website | ||
Capucinoxx marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ``` | ||
|
|
||
| 4. Assurez-vous de récupérer les dernières modifications de l'upstream | ||
| ```bash | ||
| git pull upstream main | ||
| git push origin main # to update your remote fork | ||
Capucinoxx marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ``` | ||
|
|
||
| 5. Crée une branche séparée | ||
| ```bash | ||
| git checkout -a feat/${name_of_your_modification} | ||
Capucinoxx marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| ``` | ||
|
|
||
| 6. Effectuer les modifications | ||
|
|
||
| 7. Ajouter les nouveaux fichiers modifiers | ||
|
|
||
| 8. Effectuer un commit de vos modifications | ||
|
|
||
| 7. Pousser vos modifications | ||
| ```bash | ||
| git push origin feat/${name_of_your_modification} | ||
| ``` | ||
|
|
||
| 10. Cr/er une pull request sur Github | ||
Capucinoxx marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,36 +4,13 @@ Ce dépôt contient les ressources du site web public de JDIS, accessible à l'a | |
|
|
||
| ## Pour démarrer le projet | ||
|
|
||
| ### 1. Installer les dépendances globales | ||
|
|
||
| Vous devez installer [Ruby](https://www.ruby-lang.org/fr/documentation/installation/). | ||
|
|
||
| Une fois que Ruby est installé, vous devez installer Bundler : | ||
|
|
||
| ```sh | ||
| gem install bundler | ||
| ``` | ||
|
|
||
| ### 2. Cloner le dépôt | ||
|
|
||
| ```sh | ||
| git clone [email protected]:JDIS/Website.git && cd Website | ||
| docker-compose up | ||
| ``` | ||
|
|
||
| ### 3. Installer les dépendances du projet | ||
|
|
||
| ```sh | ||
| bundle install | ||
| ``` | ||
|
|
||
| ### 4. Démarrer le serveur | ||
|
|
||
| ```sh | ||
| bundle exec jekyll serve | ||
| ``` | ||
| Le site web devrait être disponible localement à l'adresse suivante: <http://localhost:10529/>. | ||
|
|
||
| Le site web devrait être disponible localement à l'adresse suivante: <http://localhost:4000/>. | ||
|
|
||
| ## Pour contribuer | ||
|
|
||
| Vos contributions sont les bienvenues. Que ce soit pour ajouter un événement, une photo ou une information, vous pouvez créer une _pull request_ depuis la branche qui contient vos modifications. | ||
| Vos contributions sont les bienvenues. Merci de [suivre le guide de contribution](./.github/CONTRIBUTING.md) | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| version: '3.9' | ||
|
|
||
| services: | ||
| web: | ||
| image: 'jekyll/jekyll:3.8' | ||
| volumes: | ||
| - '.:/app' | ||
| working_dir: '/app' | ||
| ports: | ||
| - '10529:4000' | ||
| - '35729:35729' | ||
| command: 'jekyll serve --livereload' |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.