diff --git a/.github/workflows/preflight.yml b/.github/workflows/preflight.yml index d8c32ae..2287095 100644 --- a/.github/workflows/preflight.yml +++ b/.github/workflows/preflight.yml @@ -42,11 +42,6 @@ jobs: - name: Check out repository uses: actions/checkout@v4 - - name: Prepare working directory - run: | - mkdir $REPORTS_DIR node-config - echo "development_mode: yes" > node-config/sign_node.yml - - name: Set up Docker Buildx # https://github.com/marketplace/actions/docker-setup-buildx uses: docker/setup-buildx-action@v3 @@ -62,6 +57,7 @@ jobs: - name: Run Pytest run: | + mkdir $REPORTS_DIR docker compose run --rm sign_node bash -c " pytest -v --cov \ --junit-xml=$REPORTS_DIR/pytest-report.xml \ diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml index 26e2afa..63dc1a4 100644 --- a/.github/workflows/run-tests.yml +++ b/.github/workflows/run-tests.yml @@ -17,11 +17,6 @@ jobs: - name: Check out repository uses: actions/checkout@v4 - - name: Prepare working directory - run: | - mkdir node-config - echo "development_mode: yes" > node-config/sign_node.yml - - name: Set up Docker Buildx # https://github.com/marketplace/actions/docker-setup-buildx uses: docker/setup-buildx-action@v3 diff --git a/.gitignore b/.gitignore index 1b2cc1b..5b0f1f8 100644 --- a/.gitignore +++ b/.gitignore @@ -132,6 +132,3 @@ dmypy.json .idea/ .vscode/ .DS_Store - -# Misc -node-config/ diff --git a/Dockerfile b/Dockerfile index 9d0435e..34fca1b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,20 @@ FROM almalinux:9 COPY signnode.repo /etc/yum.repos.d/signnode.repo -RUN dnf upgrade -y && dnf install -y --enablerepo="buildsystem" \ - rpm-sign pinentry keyrings-filesystem ubu-keyring debian-keyring raspbian-keyring git && \ - dnf clean all +RUN <