Skip to content
This repository was archived by the owner on Sep 16, 2022. It is now read-only.

Fix wott-agent build in balena image. #2

Open
a-martynovich wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix wott-agent build in balena image. #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a60dd62
Fix wott-agent build in balena image.
a-martynovich Jun 25, 2019
35dc9f8
Fix iptables import error. Use wott-agent daemon instead of start.sh.
a-martynovich Jun 25, 2019
7613ecd
Use agent from master.
a-martynovich Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aws-iot/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3-stretch-build
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3.5-stretch-build

WORKDIR /usr/src/app

Expand Down
2 changes: 1 addition & 1 deletion google-core-iot/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3-stretch-build
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3.5-stretch-build

WORKDIR /usr/src/app

Expand Down
15 changes: 6 additions & 9 deletions wott-agent/Dockerfile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3-stretch-build
FROM balenalib/%%BALENA_MACHINE_NAME%%-python:3.5-stretch-build


WORKDIR /usr/src/app
ENV PYTHONUNBUFFERED=1

RUN apt-get update && \
apt-get install -y --no-install-recommends libssl-dev libffi-dev git-core && \
apt-get install -y --no-install-recommends libssl-dev libffi-dev git-core pkg-config libsystemd-dev xtables-addons-common libip4tc0 libiptc0 libip6tc0 iptables && \
apt-get clean
RUN pip3 install --upgrade setuptools pip

RUN pip install -U pip

# Don't pin releases yet
RUN pip install git+https://github.com/WoTTsecurity/agent.git@7b399029c8da911bd1ef46aabe1079ce815f71b4
RUN pip3 install git+https://github.com/WoTTsecurity/agent.git@master
Copy link
Copy Markdown
Contributor

@vpetersson vpetersson Jun 26, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@a-martynovich I think we need to either pin this, or use the git hash as an env variable. If not, docker build will never pick up on any changes upstream here.


# Balena specific path override
ENV CERT_PATH=/data/wott/certs

COPY start.sh /start.sh

CMD /start.sh
CMD wott-agent daemon