-
-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Tox py3.7 + pipenv - Python3 Dockerfile.py - Dockerfile.py tags remote instead of just local image names now - Circle.sh instead of in-line circle.yml script breakout - probably other stuff I forgot - Docker images build during the tests should hopefullly now be available at the deploy job workflow thanks to shared docker layers. - Rename aarch64 to arm64 to reduce custom map
- Loading branch information
Showing
22 changed files
with
921 additions
and
145 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,5 @@ | ||
**/*.sw* | ||
.tox | ||
.git | ||
**/__pycache__ | ||
.pipenv |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,9 +3,11 @@ | |
.cache | ||
__pycache__ | ||
.tox | ||
.pipenv | ||
.eggs | ||
UNKNOWN.egg-info | ||
.env | ||
ci-workspace | ||
|
||
# WIP/test stuff | ||
doco.yml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
#!/usr/bin/env sh | ||
# alpine sh only | ||
|
||
set -eux | ||
./Dockerfile.py -v --arch="${ARCH}" --hub_tag="${ARCH_IMAGE}" | ||
# TODO: Add junitxml output and have circleci consume it | ||
# 2 parallel max b/c race condition with docker fixture (I think?) | ||
py.test -vv -n 2 -k "${ARCH}" ./test/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
FROM docker:latest | ||
|
||
# Based on https://github.com/Ilhicas/alpine-pipenv | ||
ARG packages | ||
RUN apk --update add python3 python3-dev curl gcc make \ | ||
musl-dev libffi-dev openssl-dev ${packages} \ | ||
&& rm -rf /var/cache/apk/* \ | ||
&& pip3 install -U pip pipenv | ||
|
||
|
||
# -v "$(pwd):/$(pwd)" -w "$(pwd)" to prevent nested docker path confusion | ||
COPY ./Dockerfile.sh /usr/local/bin/ | ||
COPY Pipfile* /root/ | ||
WORKDIR /root | ||
|
||
RUN pipenv install --system \ | ||
&& sed -i 's|/bin/sh|/bin/bash|g' /usr/lib/python3.8/site-packages/testinfra/backend/docker.py | ||
|
||
|
||
RUN echo "set -ex && Dockerfile.sh && \$@" > /usr/local/bin/entrypoint.sh | ||
RUN chmod +x /usr/local/bin/entrypoint.sh | ||
ENTRYPOINT entrypoint.sh | ||
CMD Dockerfile.sh |
Oops, something went wrong.