Table des matières
0 billet(s) pour février 2026
Git gestion des conflits merge
Voir :
-
- Mais remplacez
git push --forcepargit push --force-with-lease
Undo uncommited
remove any non-committed changes.
Par exemple pour annuler un pb de merge
git checkout -f
Résolution de conflit
git checkout master git merge --no-ff --no-commit branch_feature # git merge --no-ff --no-commit branch_feature --no-edit #ou Pour cacher les micro-commits #git merge --squash branch_feature
Si both modified
git checkout --ours fichier.txt # Version originale git checkout --theirs fichier.txt # Version modifiée git add fichier # Ajout de la version du fichier que l'on a choisie git commit fichier # Mise à jour du dépôt avec la nouvelle version du fichier #ou git merge --continue
Git diff ours theirs Git diff précédente version et les modifs des autres (theirs)
git diff :1:tasks/main.yml :3:tasks/main.yml
Git diff précédente version et nos modifs (ours)
git diff :1:tasks/main.yml :2:tasks/main.yml
Il existe aussi une commande permettant de voir les différents changements entre les versions dans un fichier. Cette commande affiche dans le fichier sur les sections modifiées trois versions : les changements que l'on a effectués, les changements effectués dans la branche par d'autres développeurs et l'ancêtre commun des deux fichiers :
Commande pour afficher les changements dans les fichiers.
git config merge.conflictstyle diff3
List files which have conflicts
git ls-files --unmerged
Mark conflict resolved
git update-index target-ppc/cpu.h
En cas de conflits
git mergetool
Doc Gitlab à propos de la résolution de conflits
Check out, review, and merge locally
Step 1. Fetch and check out the branch for this merge request
git fetch origin git checkout -b "master" "origin/master"
Step 2. Review the changes locally
Step 3. Merge the branch and fix any conflicts that come up
git fetch origin git checkout "dev" git merge --no-ff "master"
Step 4. Push the result of the merge to GitLab
git push origin "dev" Tip: You can also checkout merge requests locally by following these guidelines https://gitlab.acme.fr/help/user/project/merge_requests/reviewing_and_managing_merge_requests.md#checkout-merge-requests-locally-through-the-head-ref
Git derrière un proxy HTTP
Source : http://stackoverflow.com/questions/783811/getting-git-to-work-with-a-proxy-server
git config --global http.proxy http://proxyuser:proxypwd@proxy.server.com:8080
Effacement de la conf proxy
git config --global --unset http.proxy
Vérif conf Finally, to check the currently set proxy:
git config --global --get http.proxy
Ansible Docker Execution Environment
Voir :
Voir aussi les execution-environment.yml :
Installation
pip install --user ansible-builder>=3.0.0
Utilisation
Fichiers :
- execution-environment.yml
- ansible.cfg
- requirements.txt
- requirements.yml
- bindep.txt
podman login --tls-verify=false registry.acme.fr -u admin # podman login --tls-verify=false registry.acme.fr -u admin -p P@ssw0rd # Créer le dossier context/ avec le Containerfile ansible-builder create #--file execution-environment-dev.yml # Créer l'image du container à partir du Containerfile généré podman build -f context/Containerfile -t img01:0.9.1 # Ou pour générer directement l'image du container : ansible-builder build --tag img01:0.9.1 podman images podman image prune podman tag localhost/img01:0.9.1 aahub.acme.local/img01:0.9.1 podman images podman push aahub.acme.local/img01:0.9.1 ansible-navigator images --eei aahub.acme.local/img01:0.9.1
cd ansible-2.3_rhel5-repo/ vim context/Containerfile vim requirements.txt vim requirements.yml vim bindep.txt vim execution-environment.yml ansible-builder build -v 3 --tag img-rhel5_0.1 podman build -f context/Containerfile -t img-rhel5_0.1 pip3 download psutils podman push --tls-verify=false twr00210f.acme.local/img-rhel5_0.2 --log-level debug ansible-navigator --eei twr00210f.acme.local/acme-provisioning-dell:latest --tls-verify=false ansible-navigator --eei twr00210f.acme.local/acme-provisioning-dell:latest --pa='--tls-verify=false' ansible-navigator --eei twr00210f.acme.local/acme-provisioning-dell:latest export ANSIBLE_NAVIGATOR_PULL_ARGUMENT="tls-verify=false" vim /etc/containers/registries.conf ansible-navigator -m stdout run reboot_idrac.yml -i inv.yml --eei twr00210f.acme.local/acme-provisioning-dell:latest ansible-builder introspect --help podman build -f context/Containerfile -t ee-test:0.3
mkdir plop cd plop
Nettoyage
podman image prune podman rmi <image> rm -rf ./context/
ansible.cfg
# Since Ansible 2.12 (core): # To generate an example config file (a "disabled" one with all default settings, commented out): # $ ansible-config init --disabled > ansible.cfg # # Also you can now have a more complete file by including existing plugins: # ansible-config init --disabled -t all > ansible.cfg # For previous versions of Ansible you can check for examples in the 'stable' branches of each version # Note that this file was always incomplete and lagging changes to configuration settings # for example, for 2.9: https://github.com/ansible/ansible/blob/stable-2.9/examples/ansible.cfg [galaxy] server_list = rh-certified_repo, published_repo, community_repo, galaxy [galaxy_server.rh-certified_repo] token=xxxxxxxxxxxxxx1 url=https://aahub.acme.local/api/galaxy/content/rh-certified/ [galaxy_server.published_repo] token=xxxxxxxxxxxxxx2 url=https://aahub.acme.local/api/galaxy/content/published/ [galaxy_server.community_repo] token=xxxxxxxxxxxxxx3 url=https://aahub.acme.local/api/galaxy/content/community/ [galaxy_server.galaxy] url=https://galaxy.ansible.com/
bindep.txt
python3-jmespath
requirements.yml
--- collections: - ansible.windows - community.general - ansible.posix - awx.awx
requirements.txt
hvac kafka-python
execution-environment.yml
--- version: 1 build_arg_defaults: ANSIBLE_GALAXY_CLI_COLLECTION_OPTS: "-c" EE_BASE_IMAGE: aahub.acme.local/ee-minimal-rhel8:latest EE_BUILDER_IMAGE: aahub.acme.local/ansible-builder-rhel8:latest ansible_config: 'ansible.cfg' dependencies: python: requirements.txt galaxy: requirements.yml system: bindep.txt additional_build_steps: prepend: - RUN pip3 install --upgrade pip setuptools && echo "cacert ~/ca" > ~/.curlrc && mkdir -p ~/ca - COPY ./cert.crt ~/ca - RUN rpm --import https://srv1.acme.local/katello/api/v2/repositories/2406/gpg_key_content
context/Containerfile
ARG EE_BASE_IMAGE=aahub.acme.local/ee-minimal-rhel8:latest ARG EE_BUILDER_IMAGE=aahub.acme.local/ansible-builder-rhel8:latest FROM $EE_BASE_IMAGE as galaxy ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS=-c USER root ADD _build/ansible.cfg ~/.ansible.cfg ADD _build /build WORKDIR /build RUN ansible-galaxy role install -r requirements.yml --roles-path "/usr/share/ansible/roles" RUN ANSIBLE_GALAXY_DISABLE_GPG_VERIFY=1 ansible-galaxy collection install $ANSIBLE_GALAXY_CLI_COLLECTION_OPTS -r requirements.yml --collections-path "/usr/share/ansible/collections" FROM $EE_BUILDER_IMAGE as builder COPY --from=galaxy /usr/share/ansible /usr/share/ansible ADD _build/requirements.txt requirements.txt RUN ansible-builder introspect --sanitize --user-pip=requirements.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt RUN assemble FROM $EE_BASE_IMAGE USER root RUN pip3 install --upgrade pip setuptools && echo "cacert ~/ca" > ~/.curlrc && mkdir -p ~/ca COPY ./cert.crt ~/ca RUN rpm --import https://srv1.acme.local/katello/api/v2/repositories/2406/gpg_key_content COPY --from=galaxy /usr/share/ansible /usr/share/ansible COPY --from=builder /output/ /output/ RUN /output/install-from-bindep && rm -rf /output/wheels
version: 3 dependencies: galaxy: requirements.yml python: requirements.txt system: bindep.txt # ansible_core: # package_pip: ansible-core==2.14.4 # # ansible_runner: # package_pip: ansible-runner # # python_interpreter: # package_system: python39 # (optional) name of a Python interpreter OS package to install # python_path: /usr/bin/python3.9 # (optional) path to the Python interpreter to use exclude: python: - docker system: - python3-Cython images: base_image: # name: quay.io/centos/centos:stream9 # name: quay.io/ansible/ansible-runner:latest # Obsoltete # name: ghcr.io/ansible-community/community-ee-minimal:2.16.0-1 # name: quay.io/ansible/awx-ee:latest name: ghcr.io/ansible-community/community-ee-base:2.19.1-1 # additional_build_files: # - src: files/ansible.cfg # dest: configs additional_build_steps: # prepend_galaxy: # - ADD _build/configs/ansible.cfg ~/.ansible.cfg prepend_base: # - RUN echo PLOP append_final: # - RUN groupadd --gid 1000 vscode # - RUN adduser --home-dir /vscode --create-home --gid 1000 --uid 1000 vscode - RUN ls -l options: user: '1000'
execution-environment.yml
--- version: 3 dependencies: galaxy: requirements.yml python: requirements.txt system: bindep.txt images: base_image: name: ghcr.io/ansible-community/community-ee-base:2.19.1-1 options: user: '1000'
requirements.yml
--- collections: - ansible.utils - ansible.posix - ansible.windows - ansible.netcommon - community.general - community.windows - community.vmware - community.crypto - community.postgresql - community.mysql - community.network - kubernetes.core - containers.podman - awx.awx - vmware.vmware - vmware.vmware_rest - microsoft.ad # - fortinet.fortios
requirements.txt
six psutil # pywinrm jc jmespath
bindep.txt
git rsync curl wget psmisc tar unzip gzip #python38-wheel [platform:centos-8 platform:rhel-8] iputils [platform:rpm] bind-utils [platform:rpm] #python3-jmespath [platform:rpm] #net-snmp-utils [platform:rpm]
Exemple de fichier bindep.txt :
Git - Purger les gros fichiers binaires de l'historique - Réduire la taille d'un dépôt GIT
Voir :
- git-filter-branch
- git-filter-repo
Use the BFG Repo-Cleaner, a simpler, faster alternative to git-filter-branch specifically designed for removing unwanted files from Git history.
Carefully follow the usage instructions, the core part is just this:
java -jar bfg.jar --strip-blobs-bigger-than 100M my-repo.git
Any files over 100MB in size (that aren't in your latest commit) will be removed from your Git repository's history. You can then use git gc to clean away the dead data:
git reflog expire --expire=now --all && git gc --prune=now --aggressive
After pruning, we can force push to the remote repo*
git push --force
- NOTE: cannot force push a protect branch on GitHub
The BFG is typically at least 10-50x faster than running git-filter-branch, and generally easier to use.
git filter-branch --tree-filter 'rm -f DVD-rip' HEAD
Git - créer et appliquer un patch
Source : http://renaudmathieu.fr/creer-et-appliquer-un-patch-avec-git/
Vérifier les derniers commits
git log --pretty=oneline -10
Créer un patch
#git format-patch -1 <sha1> --stdout > <name>.patch git format-patch -1 13e260ea2c3220a217626b12bff538916fdd2caf
Voir les informations contenues dans un patch
# Lister le diffstat sur la sortie standard. git apply --stat plop.patch # Verif git apply --check plop.patch
Appliquer un patch L'option --signoff sert à utiliser l’identité et le message contenu dans le patch (au lieu d’utiliser votre identité) et k pour conserver les flags ( les zones entre [ ] dans le message du commit).
git am --signoff -k < plop.patch