Merge pull request #148 from nghiant2710/master

Remove systemd from language specific base images
balena-io-library · Jul 14, 2016 · 0402a8f · 0402a8f
2 parents 5624e1e + 9cc4ca9
commit 0402a8f
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/golang/generate-dockerfile.sh b/golang/generate-dockerfile.sh
@@ -160,7 +160,7 @@ for device in $devices; do
 
 		# Only for RPI1 device
 		if [ $device == "raspberrypi" ]; then
-			base_image="resin/$device-systemd:jessie"
+			base_image="resin/rpi-raspbian:jessie"
 		else
 			base_image="resin/$device-debian:jessie"
 		fi

diff --git a/golang/raspberrypi/debian/1.4/slim/Dockerfile b/golang/raspberrypi/debian/1.4/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV GO_VERSION 1.4.3
 

diff --git a/golang/raspberrypi/debian/1.5/slim/Dockerfile b/golang/raspberrypi/debian/1.5/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV GO_VERSION 1.5.4
 

diff --git a/golang/raspberrypi/debian/1.6/slim/Dockerfile b/golang/raspberrypi/debian/1.6/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV GO_VERSION 1.6.2
 

diff --git a/node/generate-latest-dockerfile.sh b/node/generate-latest-dockerfile.sh
@@ -173,7 +173,7 @@ for device in $devices; do
 
 		# Only for RPI1 device
 		if [ $device == "raspberrypi" ]; then
-			sed -e s~#{FROM}~resin/$device-systemd:jessie~g \
+			sed -e s~#{FROM}~resin/rpi-raspbian:jessie~g \
 				-e s~#{BINARY_URL}~$binary_url~g \
 				-e s~#{NODE_VERSION}~$nodeVersion~g \
 				-e s~#{CHECKSUM}~"$checksum"~g \

diff --git a/node/raspberrypi/debian/0.10/slim/Dockerfile b/node/raspberrypi/debian/0.10/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 0.10.46
 

diff --git a/node/raspberrypi/debian/0.12/slim/Dockerfile b/node/raspberrypi/debian/0.12/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 0.12.15
 

diff --git a/node/raspberrypi/debian/4.4/slim/Dockerfile b/node/raspberrypi/debian/4.4/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 4.4.7
 

diff --git a/node/raspberrypi/debian/5.12/slim/Dockerfile b/node/raspberrypi/debian/5.12/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 5.12.0
 

diff --git a/node/raspberrypi/debian/6.3/slim/Dockerfile b/node/raspberrypi/debian/6.3/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 6.3.0
 

diff --git a/node/raspberrypi/debian/default/slim/Dockerfile b/node/raspberrypi/debian/default/slim/Dockerfile
@@ -1,5 +1,5 @@
 # AUTOGENERATED FILE
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 ENV NODE_VERSION 0.10.22
 

diff --git a/python/generate-dockerfile.sh b/python/generate-dockerfile.sh
@@ -183,7 +183,7 @@ for device in $devices; do
 
 		# Only for RPI1 device
 		if [ $device == "raspberrypi" ]; then
-			sed -e s~#{FROM}~"resin/$device-systemd:jessie"~g \
+			sed -e s~#{FROM}~"resin/rpi-raspbian:jessie"~g \
 				-e s~#{PYTHON_VERSION}~"$pythonVersion"~g \
 				-e s~#{PYTHON_BASE_VERSION}~"$baseVersion"~g \
 				-e s~#{BINARY_URL}~"$binary_url"~g \

diff --git a/python/raspberrypi/debian/2.7/slim/Dockerfile b/python/raspberrypi/debian/2.7/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 # remove several traces of debian python
 RUN apt-get purge -y python.*

diff --git a/python/raspberrypi/debian/3.3/slim/Dockerfile b/python/raspberrypi/debian/3.3/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 # remove several traces of debian python
 RUN apt-get purge -y python.*

diff --git a/python/raspberrypi/debian/3.4/slim/Dockerfile b/python/raspberrypi/debian/3.4/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 # remove several traces of debian python
 RUN apt-get purge -y python.*

diff --git a/python/raspberrypi/debian/3.5/slim/Dockerfile b/python/raspberrypi/debian/3.5/slim/Dockerfile
@@ -1,4 +1,4 @@
-FROM resin/raspberrypi-systemd:jessie
+FROM resin/rpi-raspbian:jessie
 
 # remove several traces of debian python
 RUN apt-get purge -y python.*