sporq/kmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let's try alpine for Circle images

Browse Source
This commit is contained in:
Josh Klar 2019-07-20 15:01:17 -07:00
parent 1e9625ae0e
commit ea62d08d2c
No known key found for this signature in database
GPG Key ID: A4A0C7B4E8EEE222
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Dockerfile_base
View File

@ -3,19 +3,7 @@
# Not using python:3.7 here because team-gcc-arm-embedded/ppa does not support # Not using python:3.7 here because team-gcc-arm-embedded/ppa does not support
# Ubuntu Cosmic or Debian Stretch, and Alpine, bizarrely, does not seem to # Ubuntu Cosmic or Debian Stretch, and Alpine, bizarrely, does not seem to
# package GCC cross compilers # package GCC cross compilers
FROM ubuntu:bionic FROM python:3.7-alpine
# Set up PPAs we'll need for Python and for GCC ARM RUN apk update && apk add alpine-sdk curl wget ssh rsync git git-lfs
RUN apt-get update && apt-get install -y software-properties-common RUN pip install pipenv
RUN add-apt-repository ppa:deadsnakes/ppa
RUN add-apt-repository ppa:team-gcc-arm-embedded/ppa
# Install Python
RUN apt-get update && apt-get install -y python3.7 python3.7-dev build-essential pkg-config libffi-dev curl
RUN curl https://bootstrap.pypa.io/get-pip.py | python3.7
# Downgrade pip to work around https://github.com/pypa/pipenv/issues/2924
RUN python3.7 -m pip install pip==18.0
RUN python3.7 -m pip install pipenv==2018.7.1
# Install KMK CI and/or build-time dependencies
RUN apt-get install -y gcc-arm-embedded gettext ssh wget unzip rsync git locales libusb-dev

5
Makefile
View File

@ -12,7 +12,6 @@ DOCKER_TAG ?= latest
AMPY_PORT ?= /dev/ttyUSB0 AMPY_PORT ?= /dev/ttyUSB0
AMPY_BAUD ?= 115200 AMPY_BAUD ?= 115200
AMPY_DELAY ?= 1.5 AMPY_DELAY ?= 1.5
ARDUINO ?= /usr/share/arduino
PIPENV ?= $(shell which pipenv) PIPENV ?= $(shell which pipenv)
all: copy-kmk copy-bootpy copy-keymap all: copy-kmk copy-bootpy copy-keymap
@ -49,6 +48,10 @@ clean-build-log:
@echo "===> Clearing previous .build.log" @echo "===> Clearing previous .build.log"
@rm -rf .build.log @rm -rf .build.log
# This is mostly a leftover from the days we vendored stuff from
# micropython-lib via submodules. Leaving this here mostly in case someone goes
# exploring through the history of KMK's repo and manages to screw up their
# repo state (those were glitchy times...)
powerwash: clean powerwash: clean
@echo "===> Removing vendor/ to force a re-pull" @echo "===> Removing vendor/ to force a re-pull"
@rm -rf vendor @rm -rf vendor