Merge pull request #12 from mr-bolle/dev

RPi Image now alpine:3.8.4
mr-bolle · Nov 20, 2019 · 70c2ae8 · 70c2ae8
2 parents d41d2d4 + 32fb0db
commit 70c2ae8
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@ Changelog
 
 :construction: Work in Progress - [see issue #1](https://github.com/mr-bolle/docker-openvpn-pihole/issues/1)
 
+0.91 2019.11.20
+- use the last working Image for Rasperry Pi Devices (now use the Image **alpine:3.8.4**)
+
 0.9 2019.06.02
 - [CVE-2019-5021](https://www.zdnet.com/article/alpine-linux-docker-images-ship-a-root-account-with-no-password/) fix Alpine image `root account without password` for Raspberry Pi Devices (now use the Image `arm32v7/alpine:latest`)
 - add `.gitignore` and fix issue with command `ip` with MacOS Host [#PullRequest_8](https://github.com/mr-bolle/docker-openvpn-pihole/pull/8) thanks @darth-veitcher

diff --git a/README.md b/README.md
@@ -7,12 +7,12 @@ Many thanks to:
 GitHub @ [kylemanna/docker-openvpn](https://github.com/kylemanna/docker-openvpn/)  
 GitHub @ [pi-hole/docker-pi-hole](https://github.com/pi-hole/docker-pi-hole/)
 
-Now you can use this repository with the Hardwaretype x86_x64 and amr (Test with Raspberry Pi 2)
+Now you can use this repository with the Hardwaretype x86_x64 and amr (Test with **Raspberry Pi 2 (armhf) & Rasperry Pi Zero W (armv6))**
 
 *YouTube: HowTo create this Container in about 4 Minutes*
 [![HowTo create this Container in about 4 Minutes](https://abload.de/img/screenshotcpjyo.jpg)](https://www.youtube.com/embed/8sRtCERYVzk)
 
-### [Changelog](https://github.com/mr-bolle/docker-openvpn-pihole/blob/master/CHANGELOG.md)
+### :newspaper: [Changelog](https://github.com/mr-bolle/docker-openvpn-pihole/blob/master/CHANGELOG.md)
 
 ### 1.1. Download and run install Script:
 ```

diff --git a/openvpn-install.sh b/openvpn-install.sh
@@ -14,20 +14,24 @@ echo -e "\nWe we are pulling the best Image of OpenVPN for docker on earth by ky
  if [ `uname -m` != 'x86_64' ]; then
          echo "** Build a Docker Image from the kylemanna/openvpn repository **"
          # docker build -t kylemanna/openvpn https://github.com/kylemanna/docker-openvpn.git
-             git clone https://github.com/kylemanna/docker-openvpn.git && cd docker-openvpn
-                 # change alpine image
-#                     sed -i "/FROM/s/latest/3.8/g" Dockerfile
-                      sed -i "/FROM/s/aarch64/arm32v7/g" Dockerfile.aarch64
-                      sed -i "/FROM/s/latest/alpine/g" Dockerfile.aarch64
-                      sed -i "/FROM/s/3.5/latest/g" Dockerfile.aarch64
-                      docker build --no-cache -t kylemanna/openvpn -f Dockerfile.aarch64 .
+         git clone https://github.com/kylemanna/docker-openvpn.git && cd docker-openvpn
+
+                # create a copy with the current architecture
+                DOCKERFILE_CUSTOM=Dockerfile.`uname -m`
+                cp Dockerfile.aarch64 $DOCKERFILE_CUSTOM     
+
+                    # Upgrade Alpine Image for OpenVPN 
+                    IMAGE_LINE=`cat -n $DOCKERFILE_CUSTOM | grep FROM |  awk '{print $1}'`	 # search line with the old Image
+                    sed -i ${IMAGE_LINE}d $DOCKERFILE_CUSTOM				                            # delete this old Image
+                    sed -i "${IMAGE_LINE}a\FROM alpine:3.8.4" $DOCKERFILE_CUSTOM            # append new Image
+
+                    docker build --no-cache -t kylemanna/openvpn -f $DOCKERFILE_CUSTOM .
                  cd .. && rm -f -r docker-openvpn
      else
          echo "** Pull the Docker Image from kylemanna/openvpn repository **"
          docker pull kylemanna/openvpn
  fi
-
-
+
 #Step 1
 sleep 1