From 07c00e3999382673f988f737e175d4bd5380aac1 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 8 Jan 2022 16:18:27 -0500 Subject: [PATCH] attempting to build from py image --- Dockerfile | 18 ++++++------------ config.yaml | 2 +- docker-compose.build.yaml | 2 +- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1648967..888ec45 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,27 +1,21 @@ # <--- Build Args --> -ARG BUILD_FROM +ARG BUILD_ARCH ARG BUILD_VERSION # <--- Image Setup --> -FROM $BUILD_FROM +FROM homeassistant/${BUILD_ARCH}-base-python:3.9-alpine3.14 WORKDIR /data # <--- System Wide Dependencies --> ENV LANG C.UTF-8 -RUN echo "https://dl-3.alpinelinux.org/alpine/v3.10/main" >> /etc/apk/repositories -RUN echo "https://dl-3.alpinelinux.org/alpine/v3.10/community" >> /etc/apk/repositories RUN apk add --no-cache \ cargo \ + rust \ gcompat \ nodejs \ - python3 \ - python3-dev \ - py3-pip \ - patchelf \ - rust -RUN patchelf --add-needed libgcompat.so.0 /usr/bin/python3.9 -RUN echo 'manylinux1_compatible = True' > /usr/lib/python3.9/_manylinux.py -RUN pip install -U wheel pip + build-base \ + python3-dev +RUN pip install -U wheel setuptools pip # <--- Python Dependencies --> COPY api/setup.py /data/setup.py diff --git a/config.yaml b/config.yaml index a55667b..4c24702 100644 --- a/config.yaml +++ b/config.yaml @@ -1,5 +1,5 @@ name: Shortumation -version: 0.0.6 +version: 0.0.6b slug: shortumation url: "https://github.com/asosnovsky/Shortumation" description: "A homeassitant addon which provides better UI for automations & scripts." diff --git a/docker-compose.build.yaml b/docker-compose.build.yaml index b8199b9..81edc3d 100644 --- a/docker-compose.build.yaml +++ b/docker-compose.build.yaml @@ -6,4 +6,4 @@ services: context: "./" dockerfile: "./Dockerfile" args: - - BUILD_FROM=homeassistant/${ARCH:-amd64}-base:latest + - BUILD_ARCH=${ARCH:-amd64}