Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Makefule rules "setup-virtualenv" and "check-program" within invocation of "make setup" #19

Merged
merged 4 commits into from Sep 5, 2019
Merged

Fix Makefule rules "setup-virtualenv" and "check-program" within invocation of "make setup" #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a56d0c
add docker-compose
poesel Sep 3, 2019
5bca955
moved docker files because of tool/ path
poesel Sep 4, 2019
508d468
fix broken tests
poesel Sep 4, 2019
58a2f59
smaller diff
poesel Sep 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions Dockerfile
View file
Open in desktop
@@ -1,8 +1,9 @@
# https://github.com/pycom/pycom-libraries/tree/master/pycom-docker-fw-build

FROM ubuntu:bionic
FROM debian:buster-slim

RUN apt-get update && apt-get -y install wget git build-essential python python-serial && \
RUN apt-get update && \
apt-get -y install wget git build-essential python python-serial python-virtualenv python3-virtualenv && \
mkdir /opt/frozen/ && cd /opt && \
wget -q https://dl.espressif.com/dl/xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz && \
tar -xzvf xtensa-esp32-elf-linux64-1.22.0-80-g6c4433a-5.2.0.tar.gz && \
Expand Down
28 changes: 28 additions & 0 deletions docker-compose.yml
View file
Open in desktop
@@ -0,0 +1,28 @@
version: '3.7'


services:

portainer:
image: portainer/portainer
container_name: portainer
restart: unless-stopped
ports:
- 9000:9000
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./portainer:/data

hiveeyes:
build:
context: .
dockerfile: Dockerfile
image: debian/buster-slim
container_name: hiveeyes
restart: unless-stopped
volumes:
- ../hiveeyes-micropython-firmware:/opt/hiveeyes-micropython-firmware
stdin_open: true
tty: true


Empty file added portainer/.gitignore
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions tools/core.mk
View file
Open in desktop
Expand Up @@ -32,10 +32,10 @@ check-virtualenv:
@$(MAKE) check-program program="virtualenv" hint="Install on Debian-based systems using 'apt install python-virtualenv python3-virtualenv' or use the package manager of your choice"

setup-virtualenv2: check-virtualenv
@test -e $(python2) && virtualenv --python=python2 --no-site-packages $(venv2path)
virtualenv --python=python2 --no-site-packages $(venv2path)

setup-virtualenv3: check-virtualenv
@test -e $(python3) && virtualenv --python=python3 --no-site-packages $(venv3path)
virtualenv --python=python3 --no-site-packages $(venv3path)
$(pip3) --quiet install --requirement requirements-dev.txt

setup-environment: setup-virtualenv3
Expand Down Expand Up @@ -134,7 +134,7 @@ confirm:
@$(MAKE) prompt_yesno

check-program:
@if test "$(shell command -v $(program))" = ""; then \
@if test "$(shell command -v $(program))" != ""; then \
echo "ERROR: \"$(program)\" program not installed."; \
echo "HINT: $(hint)"; \
exit 1; \
Expand Down