Differences

This shows you the differences between two versions of the page.

--- debian:other-debian:pi-hole-debian [2018/11/08 16:41] – [Weiteres] michael
+++ debian:other-debian:pi-hole-debian [2018/12/04 15:20] – [Weiteres] michael
@@ Line 15: / Line 15: @@
 # apt-get upgrade
-# apt-get install docker
+# apt-get install docker-ce
 </code>
-''**Step 2** - Compile and install docker-compose:''<code># cd /tmp/
+''**Step 2** - Install docker-compose binary:''
-# git clone https://github.com/docker/compose.git
-# cd compose
+Neuste Version auf GitHub nachschauen: [[https://github.com/docker/compose/releases|docker-compose]]
-# docker build -t docker-compose:armhf -f Dockerfile.armhf .
-# docker run --rm --entrypoint="script/build/linux-entrypoint" -v $(pwd)/dist:/code/dist -v $(pwd)/.git:/code/.git "docker-compose:armhf"
-# ls -l
+<code># curl -L "https://github.com/docker/compose/releases/download/1.23.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
-# cp dist/docker-compose-Linux-armv7l /usr/local/bin/docker-compose
-# chmod 0755 /usr/local/bin/docker-compose
+# chmod +x /usr/local/bin/docker-compose
+# curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
 # docker-compose version
 </code>
-''**Step 3** - Install manpages for docker-compose:''<code>
-# curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose version --short)/contrib/completion/bash/docker-compose -o /etc/bash_completion.d/docker-compose
-</code>
 </WRAP>
@@ Line 272: / Line 265: @@
 <code>
 # docker-compose -f /opt/docker-pihole/docker_compose.yml up -d
-# docker ps </code>
+# docker ps -a</code>
 </WRAP>
@@ Line 341: / Line 334: @@
 </sxh>
 </hidden>
-----
 ----
@@ Line 350: / Line 341: @@
 </code>
-<hidden blacklist.txt><sxh bash;>
+<hidden blacklist.txt><sxh plain;>
 bvadtgs.scdn1.secure.raxcdn.com
 b6994dfa47cee4.com
@@ Line 360: / Line 351: @@
 </sxh>
 </hidden>
-----
 ----
@@ Line 369: / Line 358: @@
 </code>
-<hidden whitelist.txt><sxh bash;>
+<hidden whitelist.txt><sxh plain;>
 raw.githubusercontent.com
 mirror1.malwaredomains.com
@@ Line 387: / Line 376: @@
 </sxh>
 </hidden>
-----
 ----
@@ Line 396: / Line 383: @@
 </code>
-<hidden setupVars.conf><sxh bash;>
+<hidden setupVars.conf><sxh plain;>
 DHCP_START=192.168.1.180
 DHCP_END=192.168.1.250
@@ Line 424: / Line 411: @@
 </sxh>
 </hidden>
-----
 ----
@@ Line 436: / Line 421: @@
 <WRAP center box 100%>
-==== Reverse Proxy Beispiel Setup ====
+==== Reverse Proxy Setup Beispiel ====
 <code>