devtools only

JmStawikowski · Aug 25, 2019 · dcbb637 · dcbb637
1 parent 492c3f8
commit dcbb637
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/.docker/Dockerfile.alpine b/.docker/Dockerfile.alpine
@@ -64,15 +64,11 @@ COPY package.json /usr/src/node-red/
 RUN npm install
 
 USER root
-# Rebuild bcrypt
-#RUN chmod u+x /tmp/rebuild_bcrypt.sh && /tmp/rebuild_bcrypt.sh
-
 # Replace Python 2.7 with 3.6 in 36-rpi-gpio.js or remove Node-RED build-in rpi-gpio for non arm
 RUN chmod u+x /tmp/fix_python_gpio.sh && /tmp/fix_python_gpio.sh
 
 # Cleanup tmp
 RUN set -ex && \
-    #chmod u+x /tmp/uninstall_devtools.sh && /tmp/uninstall_devtools.sh && \
     rm -r /tmp/*
 
 # Return as node-red user

diff --git a/.docker/scripts/install_devtools.sh b/.docker/scripts/install_devtools.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+set -ex
+
+# Install Devtools
+if [[ ${DEVTOOLS} == "1" ]]; then
+  echo "Installing Devtools"
+  apk add --no-cache
+fi
diff --git a/.docker/scripts/uninstall_devtools.sh b/.docker/scripts/uninstall_devtools.sh
diff --git a/.travis.yml b/.travis.yml
@@ -45,12 +45,12 @@ env:
     - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=0 TAG_SUFFIX=default OS=alpine QEMU_ARCH=arm     ARCH=arm32v7
     - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=0 TAG_SUFFIX=default OS=alpine QEMU_ARCH=aarch64 ARCH=arm64v8
 
-#    # Minimal Images
-#    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=x86_64  ARCH=amd64
-#    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=arm     ARCH=arm32v6
-#    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=arm     ARCH=arm32v7
-#    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=aarch64 ARCH=arm64v8
-#
+    # Minimal Images
+    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=x86_64  ARCH=amd64
+    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=arm     ARCH=arm32v6
+    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=arm     ARCH=arm32v7
+    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=0 DEVTOOLS=0 TAG_SUFFIX=minimal OS=alpine QEMU_ARCH=aarch64 ARCH=arm64v8
+
 #    # Devtools Images
 #    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=x86_64  ARCH=amd64
 #    - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=arm     ARCH=arm32v6