Skip to content

Commit

Permalink
feat(workflow): updates to tests, and general api cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
shinybrar committed Jun 12, 2024
1 parent 0d20eaf commit 644a744
Show file tree
Hide file tree
Showing 13 changed files with 42 additions and 704 deletions.
5 changes: 1 addition & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,10 @@ jobs:
name: Install dependencies
run: |
poetry install --all-extras
-
name: Setup Workflow Workspace
run: |
poetry run workflow workspace set development
-
name: Run workflow tests
run: |
poetry run workflow workspace set development
poetry run pytest --cov workflow/ --cov-report=lcov -s -v
-
name: Upload coverage report
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Build Command
# export DOCKER_BUILDKIT=1; docker buildx build -t chimefrb/workflow:latest .

ARG PYTHON_VERSION=3.8
ARG PYTHON_VERSION=3.10

FROM python:${PYTHON_VERSION}-slim as base

Expand Down Expand Up @@ -60,7 +60,7 @@ COPY . $PYSETUP_PATH
WORKDIR $PYSETUP_PATH
# Install Project Dependencies
RUN set -ex \
&& poetry install --without dev --without docs --no-interaction --no-ansi --no-cache -v
&& poetry install --without dev --no-interaction --no-ansi --no-cache -v

# Final Image
FROM base as production
Expand Down
114 changes: 0 additions & 114 deletions docker-compose-dev.yml

This file was deleted.

28 changes: 5 additions & 23 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ services:
managers:
image: chimefrb/pipelines:latest
container_name: managers
command: python -m managers.server
command: ["/bin/bash", "-c", "touch /etc/site.yml && python -m managers.server"]
ports:
- "8002:8002"
environment:
Expand All @@ -46,10 +46,12 @@ services:
- SANIC_UPDATE_INTERVAL_SECONDS=40
- SANIC_SLEEP_INTERVAL_SECONDS=30
- SANIC_PURGE_TIME_SECONDS=3600
- SANIC_SITE_CONFIG_FILEPATH=/etc/site.yml
- DOCKER_HOST=unix:///var/run/docker.sock # Replace with production address or dind
- TZ=Etc/UTC
volumes:
- /var/run/docker.sock:/var/run/docker.sock
- ./tests/workflow-site.yml:/etc/site.yml
networks:
- workflow
healthcheck:
Expand All @@ -68,7 +70,7 @@ services:
buckets:
image: chimefrb/buckets:latest
container_name: buckets
command: [ "/bin/bash", "-c", "python -m buckets.server" ]
command: [ "/bin/bash", "-c", "workflow workspace set development && python -m buckets.server" ]
expose:
- 8004
ports:
Expand All @@ -88,7 +90,7 @@ services:
results:
image: chimefrb/results:latest
container_name: results
command: [ "/bin/bash", "-c", "python -m results.server" ]
command: [ "/bin/bash", "-c", "workflow workspace set development && python -m results.server" ]
expose:
- 8005
ports:
Expand All @@ -114,26 +116,6 @@ services:
networks:
- workflow

local:
image: docker:dind
container_name: local
command:
- "/bin/sh"
- "-c"
- |
dockerd -H tcp://0.0.0.0:4444 --tls=false \
& while(! docker -H tcp://0.0.0.0:4444 info >/dev/null 2>&1); \
do sleep 1; \
done \
&& docker -H tcp://0.0.0.0:4444 swarm init && tail -f /dev/null
ports:
- "4444:4444"
expose:
- 4444
privileged: true
networks:
- workflow

networks:
workflow:
driver: bridge
44 changes: 0 additions & 44 deletions pipeline-example.yaml

This file was deleted.

Loading

0 comments on commit 644a744

Please sign in to comment.