Skip to content

Commit

Permalink
Fixed problem with building Docker image - after enforcing regenerati…
Browse files Browse the repository at this point in the history
…on of requirements.txt
  • Loading branch information
blackandred committed Dec 1, 2019
1 parent aed9630 commit c416234
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
4 changes: 1 addition & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
/Dockerfile
/armhf.Dockerfile
/.infrastructure
/.infrastructure/*.Dockerfile
5 changes: 3 additions & 2 deletions .infrastructure/x86_64.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ RUN apk --update add python3 bash perl curl wget grep sed docker sudo mysql-clie
sshpass openssh-client
ADD . /infracheck
ADD .git /infracheck/
ADD .infrastructure /infracheck/

ENV CHECK_INTERVAL="*/1 * * * *" \
WAIT_TIME=0\
Expand All @@ -13,7 +14,7 @@ RUN cd /infracheck \
# install as a package
&& git remote remove origin || true \
&& git remote add origin https://github.com/riotkit-org/infracheck.git \
&& apk add --update gcc python3-dev musl-dev linux-headers postgresql-devel \
&& apk add --update gcc python3-dev musl-dev linux-headers postgresql-dev \
&& make install \
# after installing as package extract infrastructural files
\
Expand All @@ -27,6 +28,6 @@ RUN cd /infracheck \
# simple check that application does not crash at the beginning (is correctly packaged)
&& infracheck --help \
\
&& apk del gcc python3-dev musl-dev linux-headers postgresql-devel
&& apk del gcc python3-dev musl-dev linux-headers postgresql-dev

ENTRYPOINT ["/entrypoint.sh"]

0 comments on commit c416234

Please sign in to comment.