Skip to content

Commit

Permalink
chore: erase traces of substratools
Browse files Browse the repository at this point in the history
Signed-off-by: ThibaultFy <[email protected]>
  • Loading branch information
ThibaultFy committed Oct 3, 2024
1 parent f121a6f commit 4e16316
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 28 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,6 @@ jobs:
with:
python-version: "3.10"

- name: Clone substra-tools
uses: actions/checkout@v2
with:
repository: substra/substra-tools
path: substra-tools
ref: main

- name: Clone substra
uses: actions/checkout@v2
with:
Expand All @@ -38,11 +31,10 @@ jobs:
path: substrafl
ref: main

- name: Install substra, substra-tools and substrafl
- name: Install substra and substrafl
run: |
pip install -e ./substrafl
pip install -e ./substra
pip install -e ./substra-tools
- name: Copy substra and substrafl api doc in the doc
run: |
Expand Down
4 changes: 0 additions & 4 deletions docker/substra-documentation-examples/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,18 @@ WORKDIR /usr/src/app

### Dirty build to install docker client ###
# We need to install a docker client because substra debug mode relies on Docker (DinD in a side container)
# and we need a docker client to authenticate this docker against our container registry to download substra-tools.
RUN apt update && apt install --yes apt-transport-https ca-certificates curl gnupg lsb-release
RUN curl -fsSL https://download.docker.com/linux/debian/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
RUN echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/debian $(lsb_release -cs) stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
RUN apt update && apt install --yes docker-ce-cli

COPY substra-tools/ substra-tools/
COPY substra/ substra/
COPY substrafl/ substrafl/

RUN cd substrafl && python -m pip install --no-cache-dir -e .

RUN cd substra && python -m pip install --no-cache-dir -e .

RUN cd substra-tools && python -m pip install --no-cache-dir -e .

COPY substra-documentation/Makefile substra-documentation/
COPY substra-documentation/examples_requirements.txt substra-documentation/
COPY substra-documentation/docs/source/examples substra-documentation/docs/source/examples/
Expand Down
1 change: 0 additions & 1 deletion docs/source/additional/release.rst
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ This is an overview of the main changes, please have a look at the changelog of
- `substra changelog <https://github.com/Substra/substra/blob/main/CHANGELOG.md>`__
- `substrafl changelog <https://github.com/Substra/substrafl/blob/main/CHANGELOG.md>`__
- `frontend changelog <https://github.com/Substra/substra-frontend/blob/main/CHANGELOG.md>`__
- `substra-tools changelog <https://github.com/Substra/substra-tools/blob/main/CHANGELOG.md>`__
- `backend changelog <https://github.com/Substra/substra-backend/blob/main/CHANGELOG.md>`__
- `orchestrator changelog <https://github.com/Substra/orchestrator/blob/main/CHANGELOG.md>`__

Expand Down
9 changes: 1 addition & 8 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,13 @@
if os.environ.get("READTHEDOCS_VERSION_TYPE") == "tag" or current_commit in tagged_commits:
# Index 0 means latest release
SUBSTRA_VERSION = compat_table["releases"][0]["components"]["substra"]["version"]
TOOLS_VERSION = compat_table["releases"][0]["components"]["substra-tools"]["version"]
SUBSTRAFL_VERSION = compat_table["releases"][0]["components"]["substrafl"]["version"]

else:
SUBSTRA_VERSION = "main"
TOOLS_VERSION = "main"
SUBSTRAFL_VERSION = "main"

print(
f"Versions of the components used:"
f"\n - substra: {SUBSTRA_VERSION}"
f"\n - substra-tools: {TOOLS_VERSION}"
f"\n - substrafl: {SUBSTRAFL_VERSION}"
)
print(f"Versions of the components used:" f"\n - substra: {SUBSTRA_VERSION}" f"\n - substrafl: {SUBSTRAFL_VERSION}")


class SubSectionTitleOrder:
Expand Down
10 changes: 5 additions & 5 deletions docs/source/how-to/developing-substra/harbor.rst
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ Use external Harbor
2. Create ``docker-config`` secret

.. code:: bash
kubectl create secret docker-registry docker-config -n org-2 --docker-server=<your-registry-server> --docker-username=<your-name>
3. Update your value file (you can use ``backend-org-2-harbor.yaml`` as a model)
Expand All @@ -82,7 +82,7 @@ Use external Harbor
containerRegistry:
local: false
scheme:
scheme:
host: # The host, without the port, as it is defined in the field port
pullDomain: # The harbor host, with the port as it won't use the port field
port: 443
Expand Down Expand Up @@ -114,16 +114,16 @@ Harbor-set-up

.. code:: bash
docker pull ghcr.io/substra/substra-tools:latest
docker pull <base-image>
2. Tag it

.. code:: bash
docker tag ghcr.io/substra/substra-tools:latest $HARBOR_REGISTRY_DOMAIN/substra/substra-tools:latest
docker tag <base-image>:latest $HARBOR_REGISTRY_DOMAIN/<base-image>:latest
3. Push to repository

.. code:: bash
docker push $HARBOR_REGISTRY_DOMAIN/substra/substra-tools:latest
docker push $HARBOR_REGISTRY_DOMAIN/ <base-image>:latest
2 changes: 1 addition & 1 deletion docs/source/how-to/developing-substra/local-deployment.rst
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ Now you are ready to go, you can either run the :doc:`Substra examples </example

This local deployment is for developing or testing Substra. If you want to have a more production-ready deployment and a more customized set-up, have a look at the :doc:`deployment section <../deploying-substra/index>`.

Documentation on running tests on any of the Substra components is available on the component repositories, see `substra <https://github.com/substra/substra>`_, `substrafl <https://github.com/substra/substrafl>`_, `substra-tools <https://github.com/substra/substra-tools>`_, substra-backend_, orchestrator_, substra-frontend_ and `substra-tests <https://github.com/substra/substra-tests>`_ repositories.
Documentation on running tests on any of the Substra components is available on the component repositories, see `substra <https://github.com/substra/substra>`_, `substrafl <https://github.com/substra/substrafl>`_, substra-backend_, orchestrator_, substra-frontend_ and `substra-tests <https://github.com/substra/substra-tests>`_ repositories.

Troubleshooting
===============
Expand Down

0 comments on commit 4e16316

Please sign in to comment.