Skip to content

Commit

Permalink
try tests with same base image
Browse files Browse the repository at this point in the history
Signed-off-by: vsoch <[email protected]>
  • Loading branch information
vsoch committed Oct 23, 2023
1 parent 74db360 commit e32a546
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 10 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ on:
jobs:
build:
env:
container: ghcr.io/flux-framework/flux-restful-api
container: ghcr.io/flux-framework/flux-restful-api:test
permissions:
packages: write

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
needs: [prepare-container]
services:
api:
image: ghcr.io/flux-framework/flux-restful-api:latest
image: ghcr.io/flux-framework/flux-restful-api:test
ports:
- 5000:5000
env:
Expand All @@ -44,7 +44,7 @@ jobs:
env:
INSTALL_BRANCH: ${{ needs.prepare-container.outputs.branch }}
INSTALL_REPO: ${{ github.repository }}
image: ghcr.io/flux-framework/flux-restful-api:latest
image: ghcr.io/flux-framework/flux-restful-api:test
ports:
- 5000:5000
steps:
Expand Down
7 changes: 2 additions & 5 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
runs-on: ubuntu-latest
needs: [prepare-container]
container:
image: ghcr.io/flux-framework/flux-restful-api:latest
image: ghcr.io/flux-framework/flux-restful-api:test
ports:
- 5000
env:
Expand All @@ -29,10 +29,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Install Dependencies (in case changes)
run: |
pip install -r requirements.txt
pip install pydantic==1.10.11
pip install pydantic-settings
run: pip install -r requirements.txt

- name: Run tests
run: |
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM fluxrm/flux-sched:focal
FROM fluxrm/flux-sched:jammy

# docker build -t ghcr.io/flux-framework/flux-restful-api .

Expand All @@ -14,7 +14,7 @@ ENV HOST=${host:-0.0.0.0}
ENV WORKERS=${workers:-1}

USER root
RUN apt-get update
RUN apt-get update && apt-get install -y python3-pip
COPY ./requirements.txt /requirements.txt

EXPOSE ${port}
Expand Down

0 comments on commit e32a546

Please sign in to comment.