Skip to content

Commit 10e9073

Browse files
committed
Fix toml for data files, and added group share for docker
1 parent 6b24037 commit 10e9073

File tree

3 files changed

+42
-3
lines changed

3 files changed

+42
-3
lines changed

doc/Installing_Building_TESP.rst

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,3 +322,41 @@ If that still fails, try renormalizing the tesp repository.
322322
$ git ls-files -z | xargs -0 rm
323323
$ git checkout .
324324
325+
Docker file access with Linux as the host
326+
.........................................
327+
328+
TESP uses linux group permissions to share files between linux host and docker container.
329+
The 'runner:x:9002' group has been added to the docker image for this purpose.
330+
These instructions are to be run on your host machine.
331+
For the text below, substitute your login name for 'userName', share group name for 'groupName'.
332+
333+
To find out what 'groupName' that might have been used for the id 9002, issue the following command:
334+
335+
.. code-block:: shell-session
336+
$ cat /etc/group | grep 9002
337+
338+
If the group 'groupName:x:9002:...' is found, we need find out what groups your login has, issue the follow command:
339+
340+
.. code-block:: shell-session
341+
$ groups
342+
343+
If the 'groupName' is not a member of the group list, add the 'groupName' to the group list from '$ groups' command above to the user by modifying the 'userName':
344+
345+
.. code-block:: shell-session
346+
$ sudo usermod -aG userName,sudo,groupName userName
347+
348+
If that succeeds, you are now a member of the group and can skip the next paragraph.
349+
350+
If there are no groups with the id 9002, we must add a new group to the system.
351+
Then add the 'groupName' to the group list from '$ groups' command above to the user by modifying 'userName':
352+
353+
.. code-block:: shell-session
354+
$ sudo addgroup groupName --gid 9002
355+
$ sudo usermod -aG userName,sudo,groupName userName
356+
357+
Change the directory to your TESP clone directory and set the permissions to use the 'groupName' group for the files.
358+
359+
.. code-block:: shell-session
360+
$ cd ~/grid/tesp
361+
$ chgrp -R groupName .
362+

scripts/build/stamp.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fi
6565

6666
echo "Creating grid_binaries_$grid_ver.zip for installed binaries for grid applications software"
6767
cd "${INSTDIR}" || exit
68-
zip -r -9 "${BUILD_DIR}/grid_binaries_$grid_ver.zip" . &> "${BUILD_DIR}/grid_binaries.log" &
68+
# zip -r -9 "${BUILD_DIR}/grid_binaries_$grid_ver.zip" . &> "${BUILD_DIR}/grid_binaries.log" &
6969

7070
pip list > "${BUILD_DIR}/tesp_pypi.id"
7171

src/tesp_support/pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ Documentation = "https://tesp.readthedocs.io"
5252
Repository = "https://github.com/pnnl/tesp"
5353

5454
[tool.setuptools.packages.find]
55-
where = ["."]
55+
where = [".","tesp_support"]
5656

5757
[tool.setuptools.dynamic]
5858
version = {attr = "tesp_support.__version__"}
5959

6060
[tool.setuptools.package-data]
61-
api_datafiles = ["*.json", "*.db"]
61+
api = ["*"]
62+
"api.datafiles" = ["*.json", "*.db"]
6263

6364
[project.scripts]
6465
tesp_components = "tesp_support.api.data:tesp_component"

0 commit comments

Comments
 (0)