Skip to content

Commit

Permalink
devtools added
Browse files Browse the repository at this point in the history
  • Loading branch information
@RaymondMouthaan
RaymondMouthaan committed Aug 25, 2019
1 parent dcbb637 commit 7414d42
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 27 deletions.
3 changes: 3 additions & 0 deletions .docker/Dockerfile.alpine
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ RUN set -ex && \
# Install Python and gpio library
RUN chmod u+x /tmp/install_python_gpio.sh && /tmp/install_python_gpio.sh

# Install Devtools
RUN chmod u+x /tmp/install_devtools.sh && /tmp/install_devtools.sh

# Set work directory
WORKDIR /usr/src/node-red

Expand Down
2 changes: 1 addition & 1 deletion .docker/scripts/install_devtools.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ set -ex
# Install Devtools
if [[ ${DEVTOOLS} == "1" ]]; then
echo "Installing Devtools"
apk add --no-cache
apk apk add --no-cache nmap
fi
10 changes: 5 additions & 5 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,11 @@ env:
- 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
# - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=arm ARCH=arm32v7
# - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=aarch64 ARCH=arm64v8
#
- 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
- DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=arm ARCH=arm32v7
- DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=3 DEVTOOLS=1 TAG_SUFFIX=devtools OS=alpine QEMU_ARCH=aarch64 ARCH=arm64v8

# # Python 2 Images
# - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=2 DEVTOOLS=0 TAG_SUFFIX=python2 OS=alpine QEMU_ARCH=x86_64 ARCH=amd64
# - DOCKER_FILE=Dockerfile.alpine NODE_VERSION=10 PYTHON_VERSION=2 DEVTOOLS=0 TAG_SUFFIX=python2 OS=alpine QEMU_ARCH=arm ARCH=arm32v6
Expand Down
42 changes: 21 additions & 21 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,27 +94,27 @@ Using Alpine Linux reduces the built image size, but removes standard dependenci

The following table shows the variation of provided Node-RED images.

| **Tag** | **Node** | **Arch** | **OS** | **Python** | **GPIO** | **Devtools** | **Base Image** | **Size** |
|----------------------------|----------|----------|--------|------------|----------|--------------|------------------------|----------|
| 0.20.7-10-amd64 | 10 | amd64 | alpine | 3.x | no | no | amd64/node:10-alpine | |
| 0.20.7-10-arm32v6 | 10 | arm32v6 | alpine | 3.x | yes | no | arm32v6/node:10-alpine | |
| 0.20.7-10-arm32v7 | 10 | arm32v7 | alpine | 3.x | yes | no | arm32v7/node:10-alpine | |
| 0.20.7-10-arm64v8 | 10 | arm64v8 | alpine | 3.x | no | no | arm64v8/node:10-alpine | |
| | | | | | | | | |
| 0.20.7-10-amd64-minimal | 10 | amd64 | alpine | no | no | no | amd64/node:10-alpine | |
| 0.20.7-10-arm32v6-minimal | 10 | arm32v6 | alpine | no | no | no | arm32v6/node:10-alpine | |
| 0.20.7-10-arm32v7-minimal | 10 | arm32v7 | alpine | no | no | no | arm32v7/node:10-alpine | |
| 0.20.7-10-arm64v8-minimal | 10 | arm64v8 | alpine | no | no | no | arm64v8/node:10-alpine | |
| | | | | | | | | |
| 0.20.7-10-amd64-devtools | 10 | amd64 | alpine | 3.x | no | yes | amd64/node:10-alpine | |
| 0.20.7-10-arm32v6-devtools | 10 | arm32v6 | alpine | 3.x | yes | yes | arm32v6/node:10-alpine | |
| 0.20.7-10-arm32v7-devtools | 10 | arm32v7 | alpine | 3.x | yes | yes | arm32v7/node:10-alpine | |
| 0.20.7-10-arm64v8-devtools | 10 | arm64v8 | alpine | 3.x | no | yes | arm64v8/node:10-alpine | |
| | | | | | | | | |
| 0.20.7-10-amd64-python2 | 10 | amd64 | alpine | 2.x | no | no | amd64/node:10-alpine | |
| 0.20.7-10-arm32v6-python2 | 10 | arm32v6 | alpine | 2.x | yes | no | arm32v6/node:10-alpine | |
| 0.20.7-10-arm32v7-python2 | 10 | arm32v7 | alpine | 2.x | yes | no | arm32v7/node:10-alpine | |
| 0.20.7-10-arm64v8-python2 | 10 | arm64v8 | alpine | 2.x | no | no | arm64v8/node:10-alpine | |
| **Tag** | **Node** | **Arch** | **OS** | **Python** | **GPIO** | **Devtools** | **Base Image** | **Size** | **security** |**gpio**|
|----------------------------|----------|----------|--------|------------|----------|--------------|------------------------|----------|--------------|--------|
| 0.20.7-10-amd64 | 10 | amd64 | alpine | 3.x | no | no | amd64/node:10-alpine | ~75MB | yes | |
| 0.20.7-10-arm32v6 | 10 | arm32v6 | alpine | 3.x | yes | no | arm32v6/node:10-alpine | ~73MB | yes | yes |
| 0.20.7-10-arm32v7 | 10 | arm32v7 | alpine | 3.x | yes | no | arm32v7/node:10-alpine | ~71MB | | |
| 0.20.7-10-arm64v8 | 10 | arm64v8 | alpine | 3.x | no | no | arm64v8/node:10-alpine | ~75MB | | |
| | | | | | | | | | | |
| 0.20.7-10-amd64-minimal | 10 | amd64 | alpine | no | no | no | amd64/node:10-alpine | ~59MB | yes | |
| 0.20.7-10-arm32v6-minimal | 10 | arm32v6 | alpine | no | no | no | arm32v6/node:10-alpine | ~57MB | yes | |
| 0.20.7-10-arm32v7-minimal | 10 | arm32v7 | alpine | no | no | no | arm32v7/node:10-alpine | ~56MB | | |
| 0.20.7-10-arm64v8-minimal | 10 | arm64v8 | alpine | no | no | no | arm64v8/node:10-alpine | ~59MB | | |
| | | | | | | | | | | |
| 0.20.7-10-amd64-devtools | 10 | amd64 | alpine | 3.x | no | yes | amd64/node:10-alpine | | | |
| 0.20.7-10-arm32v6-devtools | 10 | arm32v6 | alpine | 3.x | yes | yes | arm32v6/node:10-alpine | | | |
| 0.20.7-10-arm32v7-devtools | 10 | arm32v7 | alpine | 3.x | yes | yes | arm32v7/node:10-alpine | | | |
| 0.20.7-10-arm64v8-devtools | 10 | arm64v8 | alpine | 3.x | no | yes | arm64v8/node:10-alpine | | | |
| | | | | | | | | | | |
| 0.20.7-10-amd64-python2 | 10 | amd64 | alpine | 2.x | no | no | amd64/node:10-alpine | | | |
| 0.20.7-10-arm32v6-python2 | 10 | arm32v6 | alpine | 2.x | yes | no | arm32v6/node:10-alpine | | | |
| 0.20.7-10-arm32v7-python2 | 10 | arm32v7 | alpine | 2.x | yes | no | arm32v7/node:10-alpine | | | |
| 0.20.7-10-arm64v8-python2 | 10 | arm64v8 | alpine | 2.x | no | no | arm64v8/node:10-alpine | | | |

| **Tag** | **Node** | **Arch** |**OS** | **Python** | **GPIO** | **Devtools** | **Base Image** | **Size** |
|----------------------------|----------|----------|--------|------------|----------|--------------|------------------------|----------|
Expand Down

0 comments on commit 7414d42

Please sign in to comment.