Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: add server with git history. #322

Merged
merged 29 commits into from
Nov 17, 2024

Conversation

Frosty2500
Copy link
Contributor

Add the content and git history of https://github.com/rwth-iat/basyx-python-sdk-http-server-docker under the folder server.

jkhsjdhjs and others added 25 commits March 30, 2024 15:55
The nginx config has been moved in 38303ef.
This makes the server read AASX files by default, as it seems to be the
most common usecase. Furthermore, the user can now configure the
container via environment variables. These options are also documented
in the README.
This makes the server also read JSON and XML files
- This commit adds support for loading AASX, JSON or XML files.
So the user can have a mix of these files
in the storage folder and the application will load them all.
- Changed types of storage to
LOCAL_FILE_BACKEND and LOCAL_FILE_READ_ONLY
- Adapted and refactored README.md and added more examples for running
Lower the suffixes to also match
the filenames with uppercase suffixes
Previously, the Dockerfile pointed to the 
development branch of the HTTP Server. 
This is outdated and the branch has been merged
with main. 
Therefore, we point the Dockerfile to the main 
branch.
This commit adds a docker compose file for easier deployment.

---------

Co-authored-by: s-heppner <[email protected]>
Previously, trying to run the container using
the tutorial from the `README.md` led to an error,
due to a wrongly set default storage path if
the environment variable `STORAGE_PATH` is not 
set. This fixes this issue by setting the default
storage path to `/storage` rather than the prior
relative path: `storage`.
…sitory

Previously, we used the `rwth-iat` fork to pull the SDK from,
inside the docker file, due to the fact, that the `eclipse-basyx`
repository, did not contain the necessary branch.
Now that this is the case, it makes sense to always use the
official repository.

This also fixes the dependency issues of missing dependencies, as
they have been fixed in the main repository.

Fix #8
Fix #9
Dockerfile: Change the path to the main Eclipse BaSyx Python SDK repsitory
Previously, the Eclipse BaSyx-Python SDK contained
just the SDK module. With the recent refactoring
of the SDK GitHub repository towards a monolithic
structure, the SDK module moved into the `./sdk`
subdirectory, see [basyx-python-sdk#317].

With the new repository structure, we obviously
have to adapt the install path of the SDK in this
Dockerfile, which has been done here.

[basyx-python-sdk#317]: eclipse-basyx#317
Adapt Dockerfile to new BaSyx-Python SDK repository structure
Previously our Dockerfile started from the
`tiangolo/uwsgi-nginx:python3.11` image. While 
there's nothing wrong with using a very 
specialized image that is built for running 
Python-based servers with nginx, it does limit us
in what we can modify. 

Therefore, we decided to refactor our Dockerfile
to start from Python-Alpine and install the 
required tools manually.
Copy link
Contributor

@s-heppner s-heppner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than these small documentation issues, this lgtm and we should get it ready to merge asap.

server/.gitignore Outdated Show resolved Hide resolved
server/README.md Outdated Show resolved Hide resolved
server/README.md Outdated Show resolved Hide resolved
Copy link
Contributor

@s-heppner s-heppner left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now, thank you very much!

@s-heppner s-heppner merged commit 6643281 into eclipse-basyx:main Nov 17, 2024
8 checks passed
@s-heppner s-heppner deleted the add_server_to_basyx branch November 17, 2024 12:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants