Commit 8cffad3f authored by Marek Veselý's avatar Marek Veselý
Browse files

Merge branch 'update-docker-deployment-submodule' into 'dux'

update files from docker-deployment

See merge request inject/inject-docs!122
parents f67f2694 fbdcb007
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -94,14 +94,14 @@ of the tag. If no argument is provided it pulls the newest states for every subm
- We run the following script if the repositories contain the wanted tag (e.g., v4.0.0):

    ```bash
    poetry run ./update-submodule.sh -v v4.0.0
    poetry run ./update-submodules.sh -v v4.0.0
    ```

- If the repositories do not contain a tag, but we know that latest content is wanted, we simply
    run:

    ```bash
    poetry run ./update-submodule.sh
    poetry run ./update-submodules.sh
    ```

    This will use the newest commits/content from all repositories.
@@ -138,8 +138,13 @@ The following files are pulled from other repositories:
- `CHANGELOG.md` - _/backend/definitions/_ -> _/docs/tech/architecture/definitions/_
- `openapi.yml` - _/backend/_ -> _/docs/tech/api/_
- `showcase-definition.zip` - _/definition-registry/_ -> _/files-from-repos/showcase-definition.zip_
- `introductory-definition.zip` - _/definition-registry/_ ->
    _/files-from-repos/intro-definition.zip_
- `introductory-definition.zip` - _/definition-registry/_ -> _/files-from-repos/intro-definition.zip_
- `users.md` - _/docker-deployment/_ -> _/docs/tech/installation/users.md_
- `troubleshooting.md` - _/docker-deployment/_ -> _/docs/tech/installation/troubleshooting.md_
- `README.md` - _/docker-deployment/_ -> _/docs/tech/installation/setup.md_
- `installation.md` - _/docker-deployment/_ -> _/docs/tech/installation/overview.md_
- `README.md` - _/docker-deployment/https-owncert/_ -> _/docs/tech/installation/https/owncert.md_
- `README.md` - _/docker-deployment/https/_ -> _/docs/tech/installation/https/base-setup.md_

### 3. update-links.sh

+2 −4
Original line number Diff line number Diff line
@@ -2,12 +2,10 @@

## HTTPS Deployment

<!-- TODO: update package file for Dux -->

For deployment of the IXP with SSL certificates generated via
[Certbot](https://certbot.eff.org/) by Let's Encrypt, download the latest
compose preset folder
[here](https://gitlab.fi.muni.cz/inject/docker-deployment/-/package_files/229/download).
`https` compose preset folder
[here](https://gitlab.fi.muni.cz/inject/docker-deployment/-/packages).

After downloading the preset, unzip it, set the unzipped folder as your working
directory, and follow the instructions below.
+2 −4
Original line number Diff line number Diff line
@@ -2,11 +2,9 @@

## HTTPS Deployment with your own certificates

<!-- TODO: update package file for Dux -->

For deployment of the IXP with your own SSL certificates, download the latest
compose preset folder
[here](https://gitlab.fi.muni.cz/inject/docker-deployment/-/package_files/230/download).
`https-owncert` compose preset folder
[here](https://gitlab.fi.muni.cz/inject/docker-deployment/-/packages).

After downloading the preset, unzip it, set the unzipped folder as your working
directory, and follow the instructions below.