mirror/eoli3n-dotfiles
1
0
Fork 0
mirror of https://github.com/eoli3n/dotfiles synced 2024-11-22 15:01:59 +01:00
Code Issues

no git clone in dockerfile

Browse Source
This commit is contained in:
eoli3n 2017-12-27 13:16:29 +01:00
parent 0a5959d4cb
commit 7efa195c4a
13 changed files with 55 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.travis.yml
View File

@ -9,14 +9,11 @@ branches:
- dev - dev
install: install:
- cd docker/archlinux - docker build -t archlinux/dotfiles -f docker/archlinux/Dockerfile .
- docker build -t archlinux/dotfiles . - docker build -t debian/dotfiles -f docker/debian/Dockerfile .
- cd ../debian - docker build -t centos/dotfiles -f docker/centos/Dockerfile .
- docker build -t debian/dotfiles .
- cd ../centos
- docker build -t centos/dotfiles .
script: script:
- docker run archlinux/dotfiles test.sh - docker run archlinux/dotfiles dotfiles/docker/archlinux/test.sh
- docker run debian/dotfiles test.sh - docker run debian/dotfiles dotfiles/docker/debian/test.sh
- docker run centos/dotfiles test.sh - docker run centos/dotfiles dotfiles/docker/centos/test.sh

4
README.md
View File

@ -25,8 +25,8 @@
Ansible allows to duplicate this Desktop Environment over multiple hosts with specific configuration (dualscreen, packages...). Ansible allows to duplicate this Desktop Environment over multiple hosts with specific configuration (dualscreen, packages...).
Fork Me! Please look at ``roles/*/README.md`` if exists for specific hosts configuration. Fork Me! Please look at ``roles/*/README.md`` if exists for specific hosts configuration.
## Test VMs ## Test VMs|Containers
Please check ``vagrant/*/README.md`` Please check ``vagrant/*/README.md`` and ``docker/*/README.md``
## Desktop/Laptop Environment ## Desktop/Laptop Environment

7
TODO
View File

@ -3,7 +3,9 @@
- TOTEST: ansible provisionner vagrant : https://github.com/hashicorp/vagrant/issues/7890 - TOTEST: ansible provisionner vagrant : https://github.com/hashicorp/vagrant/issues/7890
- TODO: change includes in import tasks to be able to resolv with list-tasks - TODO: change includes in import tasks to be able to resolv with list-tasks
- TOFIX: chsh in vagrant config file for FreeBSD - TOFIX: chsh in vagrant config file for FreeBSD
- TOTEST : powerlines - TOTEST: powerlines
- TOTEST: vagrant centos locales fr ?
- TOTEST: configure root account ?
- TODO: check best install method all distrib powerline - TODO: check best install method all distrib powerline
- TODO: clean zshrc - TODO: clean zshrc
- TODO: Ubuntu compat and vagrant for server tag - TODO: Ubuntu compat and vagrant for server tag
@ -13,7 +15,8 @@
to compile only dotfiles in an example dir ~/tmp ? what about lineinfile module ? to compile only dotfiles in an example dir ~/tmp ? what about lineinfile module ?
- TODO: Add {{ tag }} to fail module to limit to distrib - TODO: Add {{ tag }} to fail module to limit to distrib
- TOFIX: get current branch to checkout in Dockerfile var - TOFIX: get current branch to checkout in Dockerfile var
- TODO: docker compose pour build toutes les distros ? https://superuser.com/questions/701735/run-script-on-host-machine-during-vagrant-up
git symbolic-ref --short -q HEAD
- TODO: update all vagrant specific task to match docker tasks - TODO: update all vagrant specific task to match docker tasks
- TODO: install virtual display xephyr - TODO: install virtual display xephyr
- TODO: docker autobuild to docker run directly, edit README.md - TODO: docker autobuild to docker run directly, edit README.md

6
docker/archlinux/Dockerfile
View File

@ -42,8 +42,8 @@ WORKDIR /home/test/
ENV LANG="fr_FR.UTF-8" ENV LANG="fr_FR.UTF-8"
RUN cd /tmp; curl -o PKGBUILD https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=packer-git RUN cd /tmp; curl -o PKGBUILD https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=packer-git
RUN cd /tmp; makepkg PKGBUILD --install --needed --noconfirm RUN cd /tmp; makepkg PKGBUILD --install --needed --noconfirm
RUN git clone --recursive https://github.com/eoli3n/dotfiles RUN mkdir dotfiles
RUN cd /home/test/dotfiles; ./install.sh desktop | tee ansible.log COPY . dotfiles/
RUN cd dotfiles; ./install.sh desktop | tee ansible.log
RUN echo -e "test" | chsh -s '/usr/bin/zsh' RUN echo -e "test" | chsh -s '/usr/bin/zsh'
ADD test.sh .
ENTRYPOINT /usr/bin/zsh ENTRYPOINT /usr/bin/zsh

23
docker/archlinux/README.md
View File

@ -1,16 +1,15 @@
## Store Docker files in /home ## Build and run Locally
``` ```
sudo cp -R /var/lib/docker /home/ git clone https://github.com/eoli3n/dotfiles
sudo rm -Rf /var/lib/docker cd dotfiles
sudo ln -s /home/docker /var/lib/docker git checkout <master|dev>
sudo docker build -t archlinux/dotfiles -f docker/archlinux/Dockerfile .
sudo docker run -t archlinux/dotfiles
``` ```
## Clean Docker files ## User
``` Login : ``test``
sudo docker system prune Password : ``test``
```
## Start Docker ## Use automated online builds
``` Soon
sudo docker build -t archlinux-dotfiles .
```

2
docker/archlinux/test.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
grep 'failed=0' ~/ansible.log grep 'failed=0' ~/dotfiles/ansible.log

6
docker/centos/Dockerfile
View File

@ -31,8 +31,8 @@ RUN echo "test ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
USER test USER test
WORKDIR /home/test/ WORKDIR /home/test/
ENV LANG="fr_FR.UTF-8" ENV LANG="fr_FR.UTF-8"
RUN git clone --recursive https://github.com/eoli3n/dotfiles RUN mkdir dotfiles
RUN cd /home/test/dotfiles; ./install.sh server | tee ansible.log COPY . dotfiles/
RUN cd dotfiles; ./install.sh server | tee ansible.log
RUN echo -e "dockerpass" | chsh -s /bin/zsh RUN echo -e "dockerpass" | chsh -s /bin/zsh
ADD test.sh .
ENTRYPOINT /usr/bin/zsh ENTRYPOINT /usr/bin/zsh

26
docker/centos/README.md
View File

@ -1,20 +1,12 @@
## Build and run Locally
```
git clone https://github.com/eoli3n/dotfiles
cd dotfiles
git checkout <master|dev>
sudo docker build -t centos/dotfiles -f docker/centos/Dockerfile .
sudo docker run -t centos/dotfiles
```
## User ## User
Login : ``test`` Login : ``test``
Password : ``dockerpass`` Password : ``dockerpass``
## Store Docker files in /home
```
sudo cp -R /var/lib/docker /home/
sudo rm -Rf /var/lib/docker
sudo ln -s /home/docker /var/lib/docker
```
## Clean Docker files
```
sudo docker system prune
```
## Start Docker
```
sudo docker build -t archlinux-dotfiles .
```

2
docker/centos/test.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
grep 'failed=0' ~/ansible.log grep 'failed=0' ~/dotfiles/ansible.log

7
docker/debian/Dockerfile
View File

@ -32,8 +32,9 @@ RUN echo "test ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
USER test USER test
WORKDIR /home/test/ WORKDIR /home/test/
ENV LANG="fr_FR.UTF-8" ENV LANG="fr_FR.UTF-8"
RUN git clone --recursive https://github.com/eoli3n/dotfiles RUN mkdir dotfiles
RUN cd /home/test/dotfiles; ./install.sh server | tee ansible.log COPY . dotfiles/
RUN chown -R test:test dotfiles
RUN cd dotfiles; ./install.sh server | tee ansible.log
RUN sudo chsh -s '/usr/bin/zsh' test RUN sudo chsh -s '/usr/bin/zsh' test
ADD test.sh .
ENTRYPOINT /usr/bin/zsh ENTRYPOINT /usr/bin/zsh

22
docker/debian/README.md
View File

@ -1,16 +1,12 @@
## Store Docker files in /home ## Build and run Locally
``` ```
sudo cp -R /var/lib/docker /home/ git clone https://github.com/eoli3n/dotfiles
sudo rm -Rf /var/lib/docker cd dotfiles
sudo ln -s /home/docker /var/lib/docker git checkout <master|dev>
sudo docker build -t debian/dotfiles -f docker/debian/Dockerfile .
sudo docker run -t debian/dotfiles
``` ```
## Clean Docker files ## User
``` Login : ``test``
sudo docker system prune Password : ``test``
```
## Start Docker
```
sudo docker build -t archlinux-dotfiles .
```

2
docker/debian/test.sh
View File

@ -1,2 +1,2 @@
#!/bin/bash #!/bin/bash
grep 'failed=0' ~/ansible.log grep 'failed=0' ~/dotfiles/ansible.log

2
vagrant/archlinux/Vagrantfile vendored
View File

@ -1,8 +1,6 @@
# -*- mode: ruby -*- # -*- mode: ruby -*-
# vi: set ft=ruby : # vi: set ft=ruby :
Vagrant.configure("2") do |config| Vagrant.configure("2") do |config|
config.vm.box = "terrywang/archlinux" config.vm.box = "terrywang/archlinux"