Skip to content

Commit 613a908

Browse files
authored
Fix python package name on Apline (#288)
Also move .docker/scripts to symlinks to docker-custom/scripst so we only have to edit code once
1 parent 744d201 commit 613a908

File tree

5 files changed

+5
-23
lines changed

5 files changed

+5
-23
lines changed

.docker/Dockerfile.alpine

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ COPY flows.json /data
4444
FROM base AS build
4545

4646
# Install Build tools
47-
RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python && \
47+
RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python2 && \
4848
npm install --unsafe-perm --no-update-notifier --no-audit --no-fund --only=production && \
4949
/tmp/remove_native_gpio.sh && \
5050
cp -R node_modules prod_node_modules

.docker/scripts/install_devtools.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../docker-custom/scripts/install_devtools.sh

.docker/scripts/remove_native_gpio.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../docker-custom/scripts/remove_native_gpio.sh

docker-custom/Dockerfile.custom

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ COPY flows.json /data
4343
FROM base AS build
4444

4545
# Install Build tools
46-
RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python && \
46+
RUN apk add --no-cache --virtual buildtools build-base linux-headers udev python2 && \
4747
npm install --unsafe-perm --no-update-notifier --no-fund --only=production && \
4848
/tmp/remove_native_gpio.sh && \
4949
cp -R node_modules prod_node_modules

docker-custom/scripts/install_devtools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -ex
44
# Installing Devtools
55
if [[ ${TAG_SUFFIX} != "-minimal" ]]; then
66
echo "Installing devtools"
7-
apk add --no-cache --virtual devtools build-base linux-headers udev python python3
7+
apk add --no-cache --virtual devtools build-base linux-headers udev python2 python3
88
else
99
echo "Skip installing devtools"
1010
fi

0 commit comments

Comments
 (0)