From 84900850b4516a1b1f2ff63257f3395bf31e9605 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 13:30:32 -0600 Subject: [PATCH 01/74] creating a branch to test new dockerslim GH action on multi-stage dockerfile --- .github/workflows/buildpipeline.yaml | 2 +- .github/workflows/include-binaries.txt | 12 ++++++++++++ .github/workflows/include-files.txt | 8 ++++++++ .github/workflows/preserve-files.txt | 4 ++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/include-binaries.txt create mode 100644 .github/workflows/include-files.txt create mode 100644 .github/workflows/preserve-files.txt diff --git a/.github/workflows/buildpipeline.yaml b/.github/workflows/buildpipeline.yaml index e8a4745c2..4e6bd00b5 100644 --- a/.github/workflows/buildpipeline.yaml +++ b/.github/workflows/buildpipeline.yaml @@ -20,7 +20,7 @@ jobs: name: Build Image and Push # TODO Add this line back once we update to Python 3.9 from 3.6 # needs: Security - uses: uc-cdis/.github/.github/workflows/image_build_push.yaml@master + uses: uc-cdis/.github/.github/workflows/image_build_push_slim.yaml@feat/GPE-1121 secrets: ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }} ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }} diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt new file mode 100644 index 000000000..c5e245d7d --- /dev/null +++ b/.github/workflows/include-binaries.txt @@ -0,0 +1,12 @@ +/usr/bin/sort +/usr/bin/curl +/usr/bin/find +/bin/rm +/usr/local/bin/python +/bin/tar +/bin/ls +/usr/bin/env +/usr/local/bin/aws +/usr/bin/whoami +/usr/bin/which +/usr/local/bin/pip diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt new file mode 100644 index 000000000..f195519ea --- /dev/null +++ b/.github/workflows/include-files.txt @@ -0,0 +1,8 @@ +/var/run/gen3/uwsgi.sock +/etc/uwsgi/uwsgi.ini +/var/www/.cache/Python-Eggs/ +/usr/local/bin/pip +/usr/local/bin/python3.9-config +/usr/local/bin/python3-config +/usr/local/bin/python-config +/usr/local/lib/python3.9/site-packages/ diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt new file mode 100644 index 000000000..800e79e54 --- /dev/null +++ b/.github/workflows/preserve-files.txt @@ -0,0 +1,4 @@ +/var/ +/etc/ +/fence/ +/usr/local/lib/ From ce88b177138c1b4b76eac90ad24abacb2435b278 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 13:32:29 -0600 Subject: [PATCH 02/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index b47c19a41..1919044d4 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access Overview +## Data Access Overview TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From b39c1f66f460b94726641c49298c4fe515547531 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:19:49 -0600 Subject: [PATCH 03/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index 1919044d4..b47c19a41 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access Overview TEST +## Data Access Overview Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 03b30a21af2ba78ecd62a01832af38ce17ce2ffe Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:27:13 -0600 Subject: [PATCH 04/74] adding another binary --- .github/workflows/include-binaries.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index c5e245d7d..d67abf102 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -10,3 +10,4 @@ /usr/bin/whoami /usr/bin/which /usr/local/bin/pip +/bin/bash From a4acf8c5864ca741e800a26e771fbcf89af55ca8 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:42:26 -0600 Subject: [PATCH 05/74] adding another file to preserve --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 800e79e54..fc790d7a1 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -2,3 +2,4 @@ /etc/ /fence/ /usr/local/lib/ +/usr/local/lib/python3.9/ From 1b872885b9a0e650e962b5c748bbce8df21248e7 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:49:33 -0600 Subject: [PATCH 06/74] adding to include-files --- .github/workflows/include-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt index f195519ea..213e9fbe3 100644 --- a/.github/workflows/include-files.txt +++ b/.github/workflows/include-files.txt @@ -6,3 +6,4 @@ /usr/local/bin/python3-config /usr/local/bin/python-config /usr/local/lib/python3.9/site-packages/ +/usr/local/lib/python3.9/ From 4c6b1f3a4fc366f206c8217ac2a1be2d1cbebe73 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:52:04 -0600 Subject: [PATCH 07/74] adding another path to preserve --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index fc790d7a1..fea05ea70 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -3,3 +3,4 @@ /fence/ /usr/local/lib/ /usr/local/lib/python3.9/ +/usr/lib64/python3.9/ From 790165c95e28d8f36e921a1a48148840f09a6f7a Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:57:09 -0600 Subject: [PATCH 08/74] adding more files to preserve --- .github/workflows/preserve-files.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index fea05ea70..7edb36196 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -3,4 +3,6 @@ /fence/ /usr/local/lib/ /usr/local/lib/python3.9/ +/usr/local/lib/python3/ +/usr/local/lib/python/ /usr/lib64/python3.9/ From 90cac5f433f6551c9635c76c668b6c6c906bf74e Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 14:57:51 -0600 Subject: [PATCH 09/74] adding more files to include --- .github/workflows/include-files.txt | 2 ++ .github/workflows/preserve-files.txt | 1 + 2 files changed, 3 insertions(+) diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt index 213e9fbe3..92def23fc 100644 --- a/.github/workflows/include-files.txt +++ b/.github/workflows/include-files.txt @@ -7,3 +7,5 @@ /usr/local/bin/python-config /usr/local/lib/python3.9/site-packages/ /usr/local/lib/python3.9/ +/usr/local/lib/python3/ +/usr/local/lib/python/ diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 7edb36196..6c70d862f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,3 +6,4 @@ /usr/local/lib/python3/ /usr/local/lib/python/ /usr/lib64/python3.9/ +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py From 22f5b9725fd92c5593741f76c990caf0cf190b15 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:09:44 -0600 Subject: [PATCH 10/74] adding more preserve files --- .github/workflows/preserve-files.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 6c70d862f..ecd1380c5 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -7,3 +7,5 @@ /usr/local/lib/python/ /usr/lib64/python3.9/ /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py +/usr/local/lib/python3.9/site-packages/ From 46f16450da12156d3043b34a2d929d1436806540 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:11:51 -0600 Subject: [PATCH 11/74] testing without trailing slash --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index ecd1380c5..ea8ff7c23 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -8,4 +8,4 @@ /usr/lib64/python3.9/ /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py -/usr/local/lib/python3.9/site-packages/ +/usr/local/lib/python3.9/site-packages From 1dee53c413542fb816fa088ad472dda2bc64ab77 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:18:09 -0600 Subject: [PATCH 12/74] more preserve files --- .github/workflows/preserve-files.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index ea8ff7c23..974e8ab70 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -2,10 +2,13 @@ /etc/ /fence/ /usr/local/lib/ -/usr/local/lib/python3.9/ +/usr/local/lib/python3.9 /usr/local/lib/python3/ /usr/local/lib/python/ /usr/lib64/python3.9/ /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/langhelpers.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py +/usr/local/lib/python3.9/site-packages/sqlalchemy /usr/local/lib/python3.9/site-packages From c78aa3b46e088e9eafe4f4a0b72602971f01b9e7 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:21:23 -0600 Subject: [PATCH 13/74] testing adding files to include --- .github/workflows/include-files.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt index 92def23fc..032af4b87 100644 --- a/.github/workflows/include-files.txt +++ b/.github/workflows/include-files.txt @@ -9,3 +9,9 @@ /usr/local/lib/python3.9/ /usr/local/lib/python3/ /usr/local/lib/python/ +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/langhelpers.py +/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py +/usr/local/lib/python3.9/site-packages/sqlalchemy +/usr/local/lib/python3.9/site-packages From ad2bb2e4e46df848d3e114fc4abe4654241f17f7 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:36:43 -0600 Subject: [PATCH 14/74] adding full paths for binaries --- .github/workflows/include-binaries.txt | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index d67abf102..2b264f7ed 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,13 +1,2 @@ -/usr/bin/sort -/usr/bin/curl -/usr/bin/find -/bin/rm -/usr/local/bin/python -/bin/tar -/bin/ls -/usr/bin/env -/usr/local/bin/aws -/usr/bin/whoami -/usr/bin/which -/usr/local/bin/pip -/bin/bash +/usr/bin/* +/usr/local/bin/* From f7cef6ce4f8d3c8489ffb8febb05f02748f466a5 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 15:59:20 -0600 Subject: [PATCH 15/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index b47c19a41..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access Overview +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 8806925186b2541ddc940e70ddc2f4785b6b767d Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 16:05:19 -0600 Subject: [PATCH 16/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 46ca79c578d25b29f7f115e78a5ab63a3c1ec91e Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Wed, 1 May 2024 16:08:56 -0600 Subject: [PATCH 17/74] test --- .github/workflows/preserve-files.txt | 1 - docs/azure_architecture.md | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 974e8ab70..a8e2c96f8 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -9,6 +9,5 @@ /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py /usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py /usr/local/lib/python3.9/site-packages/sqlalchemy/util/langhelpers.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py /usr/local/lib/python3.9/site-packages/sqlalchemy /usr/local/lib/python3.9/site-packages diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 41e90bb57d02fec4b69c1dc884152f5df5ebffc4 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:32:20 -0600 Subject: [PATCH 18/74] adding different files to "preserve-files" and "include-binaries" --- .github/workflows/include-binaries.txt | 15 +++++++++++++-- .github/workflows/preserve-files.txt | 20 +++++++------------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 2b264f7ed..d67abf102 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,2 +1,13 @@ -/usr/bin/* -/usr/local/bin/* +/usr/bin/sort +/usr/bin/curl +/usr/bin/find +/bin/rm +/usr/local/bin/python +/bin/tar +/bin/ls +/usr/bin/env +/usr/local/bin/aws +/usr/bin/whoami +/usr/bin/which +/usr/local/bin/pip +/bin/bash diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index a8e2c96f8..7b2fb021a 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,13 +1,7 @@ -/var/ -/etc/ -/fence/ -/usr/local/lib/ -/usr/local/lib/python3.9 -/usr/local/lib/python3/ -/usr/local/lib/python/ -/usr/lib64/python3.9/ -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/langhelpers.py -/usr/local/lib/python3.9/site-packages/sqlalchemy -/usr/local/lib/python3.9/site-packages +/venv/lib/python3.9 +/usr/lib64/python3.9 +/venv/usr/share/licenses +/usr/share/licenses +/venv/src/authlib +/venv/lib/python3.9 +/usr/lib/python3.9 From 785b24fc74f7cf20452c7668e85098da57c614c3 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:40:08 -0600 Subject: [PATCH 19/74] adding another directory --- .github/workflows/preserve-files.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 7b2fb021a..82c7ff68b 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -3,5 +3,8 @@ /venv/usr/share/licenses /usr/share/licenses /venv/src/authlib +/usr/lib/locale +/venv/src/storage-client +/usr/share /venv/lib/python3.9 /usr/lib/python3.9 From 3b9444d0deaa6847171825b61514ac37bff38839 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:41:36 -0600 Subject: [PATCH 20/74] adding "/usr/share/locale" --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 82c7ff68b..8bd5ba8a0 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -4,6 +4,7 @@ /usr/share/licenses /venv/src/authlib /usr/lib/locale +/usr/share/locale /venv/src/storage-client /usr/share /venv/lib/python3.9 From c71efa42d50e0fdc2d7c1be5a6a032582b74bd6b Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:44:57 -0600 Subject: [PATCH 21/74] adding another file --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 8bd5ba8a0..c8f121f08 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -5,6 +5,7 @@ /venv/src/authlib /usr/lib/locale /usr/share/locale +/fence/dockerrun.bash /venv/src/storage-client /usr/share /venv/lib/python3.9 From 41c4d12f6a1257d704e8244b1071d2df43bb3d93 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:50:31 -0600 Subject: [PATCH 22/74] adding more files --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index c8f121f08..825befced 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,6 +6,7 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash +/lib/x86_64-linux-gnu /venv/src/storage-client /usr/share /venv/lib/python3.9 From 4ac5267a1e306c301d29d180281cebda7d39ce00 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:56:57 -0600 Subject: [PATCH 23/74] trying "*" for file path --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 825befced..affe64e9b 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -7,6 +7,7 @@ /usr/share/locale /fence/dockerrun.bash /lib/x86_64-linux-gnu +/lib/x86_64-linux-gnu/* /venv/src/storage-client /usr/share /venv/lib/python3.9 From 233e097ba81d12ed17e5f6c060024129422848d9 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 10:59:25 -0600 Subject: [PATCH 24/74] trying one more method --- .github/workflows/preserve-files.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index affe64e9b..13d570377 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,8 +6,7 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib/x86_64-linux-gnu -/lib/x86_64-linux-gnu/* +/lib/x86_64-linux-gnu/ /venv/src/storage-client /usr/share /venv/lib/python3.9 From ee681ab3d61ae3b46257ed45349516e573af9b54 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:07:45 -0600 Subject: [PATCH 25/74] preserving lib as a whole --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 13d570377..51c71a22b 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,7 +6,7 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib/x86_64-linux-gnu/ +/lib /venv/src/storage-client /usr/share /venv/lib/python3.9 From 267be9c17a3c848fb226b7d7d9ea770ca5bc14f3 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:12:49 -0600 Subject: [PATCH 26/74] changing path again --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 51c71a22b..825befced 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,7 +6,7 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib +/lib/x86_64-linux-gnu /venv/src/storage-client /usr/share /venv/lib/python3.9 From 93334ba25e15a2140c4fa3f9be2bfc616aacba87 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:41:17 -0600 Subject: [PATCH 27/74] adding a file --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 825befced..599ae3dd7 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -7,6 +7,7 @@ /usr/share/locale /fence/dockerrun.bash /lib/x86_64-linux-gnu +/lib/x86_64-linux-gnu/libdl.so.2 /venv/src/storage-client /usr/share /venv/lib/python3.9 From 5273e5737850a0edf6be3674cc701774ffdc6989 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:43:31 -0600 Subject: [PATCH 28/74] test --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 599ae3dd7..47788764b 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -8,6 +8,7 @@ /fence/dockerrun.bash /lib/x86_64-linux-gnu /lib/x86_64-linux-gnu/libdl.so.2 +/usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share /venv/lib/python3.9 From 52e946f4796ee0ba9db59813f6312b2d0ef75d6f Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:49:40 -0600 Subject: [PATCH 29/74] test --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 47788764b..e692e5493 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,7 +6,6 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib/x86_64-linux-gnu /lib/x86_64-linux-gnu/libdl.so.2 /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client From b482a1bf3e688bbdb68c4816eeb6bf334581e57c Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:56:19 -0600 Subject: [PATCH 30/74] test --- .github/workflows/preserve-files.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index e692e5493..dacd4a78e 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,12 +1,12 @@ /venv/lib/python3.9 -/usr/lib64/python3.9 +/usr/lib64 /venv/usr/share/licenses /usr/share/licenses /venv/src/authlib /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib/x86_64-linux-gnu/libdl.so.2 +/lib64 /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share From f5a077a3b0b24bf9d62f3396a8a5f72ad4fe327c Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:58:06 -0600 Subject: [PATCH 31/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 6d8e3bff773b876675ee646fc01a4b7823b095e2 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 11:59:52 -0600 Subject: [PATCH 32/74] revert --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index dacd4a78e..174d42a70 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,7 +6,6 @@ /usr/lib/locale /usr/share/locale /fence/dockerrun.bash -/lib64 /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share From 58a718a6de681cafb2d71e2e62d3e58b7ada5963 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:02:00 -0600 Subject: [PATCH 33/74] test --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 174d42a70..b643ebb60 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,5 +1,4 @@ /venv/lib/python3.9 -/usr/lib64 /venv/usr/share/licenses /usr/share/licenses /venv/src/authlib From 823a0ae542e1645b85a8c3dba3fc788b0fe2a616 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:04:09 -0600 Subject: [PATCH 34/74] adding it back --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index b643ebb60..174d42a70 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,4 +1,5 @@ /venv/lib/python3.9 +/usr/lib64 /venv/usr/share/licenses /usr/share/licenses /venv/src/authlib From 055a961b8dffd7744f9ddc59861c3fbfd368d2af Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:10:34 -0600 Subject: [PATCH 35/74] test --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 174d42a70..dc86a7721 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -5,7 +5,7 @@ /venv/src/authlib /usr/lib/locale /usr/share/locale -/fence/dockerrun.bash +/fence /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share From 4173e3644a436abd6263d913faf8f5d93d45f358 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:26:41 -0600 Subject: [PATCH 36/74] adding ls --- .github/workflows/include-binaries.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index d67abf102..ead20806c 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -4,7 +4,7 @@ /bin/rm /usr/local/bin/python /bin/tar -/bin/ls +/usr/bin/ls /usr/bin/env /usr/local/bin/aws /usr/bin/whoami From e46d98847523513eba46b33a1f809453a9c4a74f Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:27:07 -0600 Subject: [PATCH 37/74] adding pwd --- .github/workflows/include-binaries.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index ead20806c..9805ab541 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -5,6 +5,7 @@ /usr/local/bin/python /bin/tar /usr/bin/ls +/usr/bin/pwd /usr/bin/env /usr/local/bin/aws /usr/bin/whoami From 109e2f6f8be8c6871e88de8727ca77ef866d8678 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:28:00 -0600 Subject: [PATCH 38/74] adding /var/www/fence --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index dc86a7721..886ddea8f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,6 +6,7 @@ /usr/lib/locale /usr/share/locale /fence +/var/www/fence/ /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share From 0dc0d73684f9fe491919153d978b1bb34e607c4b Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:31:45 -0600 Subject: [PATCH 39/74] adding back tar --- .github/workflows/include-binaries.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 9805ab541..05e8e166e 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,9 +1,9 @@ /usr/bin/sort /usr/bin/curl /usr/bin/find -/bin/rm /usr/local/bin/python -/bin/tar +/usr/bin/tar +/usr/bin/rm /usr/bin/ls /usr/bin/pwd /usr/bin/env From aa15d78c39dd9599c5a45e05c04deee9182cd636 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:33:19 -0600 Subject: [PATCH 40/74] adding xz --- .github/workflows/include-binaries.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 05e8e166e..562272fa5 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -3,6 +3,7 @@ /usr/bin/find /usr/local/bin/python /usr/bin/tar +/usr/bin/xz /usr/bin/rm /usr/bin/ls /usr/bin/pwd From 9d29ed73469baa03d978c8857fdcc3e3272c73be Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:38:04 -0600 Subject: [PATCH 41/74] test --- .github/workflows/include-binaries.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 562272fa5..ed6eb05c2 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -4,6 +4,8 @@ /usr/local/bin/python /usr/bin/tar /usr/bin/xz +/usr/bin/mv +/usr/bin/mkdir /usr/bin/rm /usr/bin/ls /usr/bin/pwd From 147b4933f6d59ff84f8f1da9a2ea6a60a4dc3fb5 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 12:47:27 -0600 Subject: [PATCH 42/74] test --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 886ddea8f..f22207728 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -12,3 +12,4 @@ /usr/share /venv/lib/python3.9 /usr/lib/python3.9 +/usr/bin From 315e761226b89e1c97ca04e34228eaf0f9991689 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 13:00:24 -0600 Subject: [PATCH 43/74] Image is working- now testing removing files to make it more slim --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 60630105a60d058dcc24e7c780f599d411eec9b4 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 13:08:02 -0600 Subject: [PATCH 44/74] trying without /usr/bin --- .github/workflows/include-binaries.txt | 12 ------------ .github/workflows/preserve-files.txt | 1 - 2 files changed, 13 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index ed6eb05c2..34ba1fda8 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,17 +1,5 @@ -/usr/bin/sort -/usr/bin/curl -/usr/bin/find -/usr/local/bin/python /usr/bin/tar /usr/bin/xz /usr/bin/mv /usr/bin/mkdir -/usr/bin/rm -/usr/bin/ls -/usr/bin/pwd -/usr/bin/env -/usr/local/bin/aws -/usr/bin/whoami -/usr/bin/which -/usr/local/bin/pip /bin/bash diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index f22207728..886ddea8f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -12,4 +12,3 @@ /usr/share /venv/lib/python3.9 /usr/lib/python3.9 -/usr/bin From b80ac1778fec927fe87f74f9be2b350297847062 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 13:14:02 -0600 Subject: [PATCH 45/74] adding new include files --- .github/workflows/include-files.txt | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt index 032af4b87..4ff63f54f 100644 --- a/.github/workflows/include-files.txt +++ b/.github/workflows/include-files.txt @@ -1,17 +1,4 @@ -/var/run/gen3/uwsgi.sock -/etc/uwsgi/uwsgi.ini -/var/www/.cache/Python-Eggs/ -/usr/local/bin/pip -/usr/local/bin/python3.9-config -/usr/local/bin/python3-config -/usr/local/bin/python-config -/usr/local/lib/python3.9/site-packages/ -/usr/local/lib/python3.9/ -/usr/local/lib/python3/ -/usr/local/lib/python/ -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_preloaded.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/langhelpers.py -/usr/local/lib/python3.9/site-packages/sqlalchemy/util/_compat_py3k.py -/usr/local/lib/python3.9/site-packages/sqlalchemy -/usr/local/lib/python3.9/site-packages +/usr/bin/tar +/usr/bin/xz +/usr/bin/mv +/usr/bin/mkdir From 7e016174ba2cd6dc75c4082c67602d396693d2fd Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 13:17:44 -0600 Subject: [PATCH 46/74] test --- .github/workflows/preserve-files.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 886ddea8f..0bd7bef58 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -12,3 +12,7 @@ /usr/share /venv/lib/python3.9 /usr/lib/python3.9 +/usr/bin/tar +/usr/bin/xz +/usr/bin/mv +/usr/bin/mkdir From f34c65603fc7d41e9c1480caef03184be2993e39 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 13:23:40 -0600 Subject: [PATCH 47/74] test --- .github/workflows/preserve-files.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 0bd7bef58..09459bf14 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -15,4 +15,6 @@ /usr/bin/tar /usr/bin/xz /usr/bin/mv +/usr/bin/rm +/bin/bash /usr/bin/mkdir From 36bc7ec8231b346c8b56123dd18c836b0f5e9bd4 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 14:13:56 -0600 Subject: [PATCH 48/74] adding x86_64 --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 09459bf14..2558cdb5f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -16,5 +16,6 @@ /usr/bin/xz /usr/bin/mv /usr/bin/rm +/usr/bin/x86_64 /bin/bash /usr/bin/mkdir From 5cca7011c23e1db5e138c09e218381a1a9f77c31 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 14:23:48 -0600 Subject: [PATCH 49/74] testing executables --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 2558cdb5f..09459bf14 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -16,6 +16,5 @@ /usr/bin/xz /usr/bin/mv /usr/bin/rm -/usr/bin/x86_64 /bin/bash /usr/bin/mkdir From 4e35aadea204d54cdd8ecbecc21d31b707739b93 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 14:28:45 -0600 Subject: [PATCH 50/74] test --- .github/workflows/include-binaries.txt | 1 + .github/workflows/include-files.txt | 1 + .github/workflows/preserve-files.txt | 6 ------ 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 34ba1fda8..b51d5f2e7 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,5 +1,6 @@ /usr/bin/tar /usr/bin/xz /usr/bin/mv +/usr/bin/rm /usr/bin/mkdir /bin/bash diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt index 4ff63f54f..4232ed22b 100644 --- a/.github/workflows/include-files.txt +++ b/.github/workflows/include-files.txt @@ -1,4 +1,5 @@ /usr/bin/tar /usr/bin/xz /usr/bin/mv +/usr/bin/rm /usr/bin/mkdir diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 09459bf14..886ddea8f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -12,9 +12,3 @@ /usr/share /venv/lib/python3.9 /usr/lib/python3.9 -/usr/bin/tar -/usr/bin/xz -/usr/bin/mv -/usr/bin/rm -/bin/bash -/usr/bin/mkdir From ccac944982399421ceba8056f9d0fafd3ffd8016 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 14:59:34 -0600 Subject: [PATCH 51/74] adding ls --- .github/workflows/include-binaries.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index b51d5f2e7..0f822800b 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -4,3 +4,4 @@ /usr/bin/rm /usr/bin/mkdir /bin/bash +/usr/bin/ls From 2708eb419632c957277731317aae77472cda2588 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 15:06:37 -0600 Subject: [PATCH 52/74] test --- .github/workflows/preserve-files.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 886ddea8f..e6c705460 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,7 +1,5 @@ /venv/lib/python3.9 /usr/lib64 -/venv/usr/share/licenses -/usr/share/licenses /venv/src/authlib /usr/lib/locale /usr/share/locale @@ -9,6 +7,6 @@ /var/www/fence/ /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client -/usr/share /venv/lib/python3.9 /usr/lib/python3.9 +/usr/bin From db82f3bcdb6b5b324a1d71d016974620d0f3e6aa Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 15:17:53 -0600 Subject: [PATCH 53/74] test --- .github/workflows/include-binaries.txt | 6 ------ .github/workflows/preserve-files.txt | 3 +++ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 0f822800b..01dca2d74 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1,7 +1 @@ -/usr/bin/tar -/usr/bin/xz -/usr/bin/mv -/usr/bin/rm -/usr/bin/mkdir /bin/bash -/usr/bin/ls diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index e6c705460..d9f69c31d 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -10,3 +10,6 @@ /venv/lib/python3.9 /usr/lib/python3.9 /usr/bin +/venv/usr/share/licenses +/usr/share/licenses +/usr/share From cb0370c04048d61180fad2c2280e4e758342afa1 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 15:21:47 -0600 Subject: [PATCH 54/74] test --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index d9f69c31d..b0ef55d4f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -4,7 +4,7 @@ /usr/lib/locale /usr/share/locale /fence -/var/www/fence/ +/var/www/fence /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /venv/lib/python3.9 From beb446772f2a5441356bda70f51d50d6c58c57aa Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Thu, 2 May 2024 15:26:04 -0600 Subject: [PATCH 55/74] test --- .github/workflows/include-binaries.txt | 16 ++++++++++++++++ .github/workflows/preserve-files.txt | 8 ++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt index 01dca2d74..ed6eb05c2 100644 --- a/.github/workflows/include-binaries.txt +++ b/.github/workflows/include-binaries.txt @@ -1 +1,17 @@ +/usr/bin/sort +/usr/bin/curl +/usr/bin/find +/usr/local/bin/python +/usr/bin/tar +/usr/bin/xz +/usr/bin/mv +/usr/bin/mkdir +/usr/bin/rm +/usr/bin/ls +/usr/bin/pwd +/usr/bin/env +/usr/local/bin/aws +/usr/bin/whoami +/usr/bin/which +/usr/local/bin/pip /bin/bash diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index b0ef55d4f..f22207728 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,15 +1,15 @@ /venv/lib/python3.9 /usr/lib64 +/venv/usr/share/licenses +/usr/share/licenses /venv/src/authlib /usr/lib/locale /usr/share/locale /fence -/var/www/fence +/var/www/fence/ /usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client +/usr/share /venv/lib/python3.9 /usr/lib/python3.9 /usr/bin -/venv/usr/share/licenses -/usr/share/licenses -/usr/share From 9720544163163b8fa8eb552c4f50eb1e53c348a0 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 08:58:07 -0600 Subject: [PATCH 56/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 536d67c329d76df2824a55794bcf162b04e13f7a Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:08:10 -0600 Subject: [PATCH 57/74] removing a preserve file for testing --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index f22207728..305b53580 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -7,7 +7,6 @@ /usr/share/locale /fence /var/www/fence/ -/usr/lib/rpm/platform/x86_64-linux/macros /venv/src/storage-client /usr/share /venv/lib/python3.9 From a2eacf0bf027b56ece761526d188a80b4d055cc1 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:13:38 -0600 Subject: [PATCH 58/74] removing some preserve files for testing --- .github/workflows/preserve-files.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 305b53580..590f6ddfa 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,7 +1,5 @@ /venv/lib/python3.9 /usr/lib64 -/venv/usr/share/licenses -/usr/share/licenses /venv/src/authlib /usr/lib/locale /usr/share/locale From 4d9af4cab89fb01cf999214f5b1623c187bbc0fb Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:23:44 -0600 Subject: [PATCH 59/74] getting rid of usr/share from preserve files --- .github/workflows/preserve-files.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 590f6ddfa..c7579f57f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -6,7 +6,6 @@ /fence /var/www/fence/ /venv/src/storage-client -/usr/share /venv/lib/python3.9 /usr/lib/python3.9 /usr/bin From fb45a9c9c2434ed46d63d4c2eeeb34ec78c29d94 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:28:29 -0600 Subject: [PATCH 60/74] removing more preserve files --- .github/workflows/preserve-files.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index c7579f57f..37195d11c 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -5,7 +5,4 @@ /usr/share/locale /fence /var/www/fence/ -/venv/src/storage-client -/venv/lib/python3.9 -/usr/lib/python3.9 /usr/bin From b1315eaea5f6f2bf6ca8da84c9e88718c947ca07 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:32:44 -0600 Subject: [PATCH 61/74] removing more files to slim it furhter --- .github/workflows/preserve-files.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 37195d11c..c74c17ed3 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,8 +1,6 @@ /venv/lib/python3.9 /usr/lib64 /venv/src/authlib -/usr/lib/locale -/usr/share/locale /fence /var/www/fence/ /usr/bin From a7f0f79531426c2178ba954537723d9d86a50736 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:39:00 -0600 Subject: [PATCH 62/74] attempting to slim image further --- .github/workflows/preserve-files.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index c74c17ed3..9e608dea7 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,6 +1,4 @@ /venv/lib/python3.9 -/usr/lib64 -/venv/src/authlib /fence /var/www/fence/ /usr/bin From d7befa9fb771aa0970ef03cffbd02041075ef13b Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:47:17 -0600 Subject: [PATCH 63/74] adding back "/usr/lib64" --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 9e608dea7..8c291d3b1 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,4 +1,5 @@ /venv/lib/python3.9 /fence +/usr/lib64 /var/www/fence/ /usr/bin From 3a0d4c67db6895e08d5949eacfe0c90c07bb01ae Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:53:45 -0600 Subject: [PATCH 64/74] test removing "/fence" --- .github/workflows/preserve-files.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 8c291d3b1..4a2791f8f 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,5 +1,4 @@ -/venv/lib/python3.9 -/fence /usr/lib64 +/venv/lib/python3.9 /var/www/fence/ /usr/bin From 736b940fc74577d761d8d43ea091d6b8c7511453 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 09:57:07 -0600 Subject: [PATCH 65/74] test removing "/venv/lib/python3.9" from preserve fiels --- .github/workflows/preserve-files.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 4a2791f8f..95ae6f82b 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,4 +1,4 @@ /usr/lib64 -/venv/lib/python3.9 +/fence /var/www/fence/ /usr/bin From 107b5d729ad4cecdae09d31e38ded8396653898e Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 10:05:46 -0600 Subject: [PATCH 66/74] adding python3.9 back --- .github/workflows/preserve-files.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/preserve-files.txt b/.github/workflows/preserve-files.txt index 95ae6f82b..95829517e 100644 --- a/.github/workflows/preserve-files.txt +++ b/.github/workflows/preserve-files.txt @@ -1,4 +1,5 @@ /usr/lib64 /fence +/venv/lib/python3.9 /var/www/fence/ /usr/bin From 6691c8fe8ca5f78d35727db8a92a350817ba20cb Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 10:20:50 -0600 Subject: [PATCH 67/74] cleaning up PR --- .github/workflows/include-binaries.txt | 17 ----------------- .github/workflows/include-files.txt | 5 ----- docs/azure_architecture.md | 2 +- 3 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 .github/workflows/include-binaries.txt delete mode 100644 .github/workflows/include-files.txt diff --git a/.github/workflows/include-binaries.txt b/.github/workflows/include-binaries.txt deleted file mode 100644 index ed6eb05c2..000000000 --- a/.github/workflows/include-binaries.txt +++ /dev/null @@ -1,17 +0,0 @@ -/usr/bin/sort -/usr/bin/curl -/usr/bin/find -/usr/local/bin/python -/usr/bin/tar -/usr/bin/xz -/usr/bin/mv -/usr/bin/mkdir -/usr/bin/rm -/usr/bin/ls -/usr/bin/pwd -/usr/bin/env -/usr/local/bin/aws -/usr/bin/whoami -/usr/bin/which -/usr/local/bin/pip -/bin/bash diff --git a/.github/workflows/include-files.txt b/.github/workflows/include-files.txt deleted file mode 100644 index 4232ed22b..000000000 --- a/.github/workflows/include-files.txt +++ /dev/null @@ -1,5 +0,0 @@ -/usr/bin/tar -/usr/bin/xz -/usr/bin/mv -/usr/bin/rm -/usr/bin/mkdir diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 7bd119a24de9b9ff0ad2d90b6f37fccffd8490da Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 10:29:43 -0600 Subject: [PATCH 68/74] one last test --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 79a5704ae75aa23b5fde529416c25cd30f7930ca Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 10:29:54 -0600 Subject: [PATCH 69/74] cleanup --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 5da644c65472dd141b462a79d64f93969f4e6af1 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 11:07:39 -0600 Subject: [PATCH 70/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 5007604a2d8479b4c676a343fb8fb2cd4b0f27c0 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 11:07:48 -0600 Subject: [PATCH 71/74] revert --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From bbc61a168f5aa4c795bff1ced34218be4bf9725f Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 13:28:06 -0600 Subject: [PATCH 72/74] dummy commit --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..a59da2292 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access TEST Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 843c903727ce88ac0bcf8facafb44bf28ae4c3e9 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 13:28:15 -0600 Subject: [PATCH 73/74] revert --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index a59da2292..bdc9fbe76 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access TEST +## Data Access Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory). From 9f257d64c52aae2cf47c8b8bc9c2376e67c41d44 Mon Sep 17 00:00:00 2001 From: EliseCastle23 Date: Fri, 3 May 2024 14:28:43 -0600 Subject: [PATCH 74/74] adding back "overview" --- docs/azure_architecture.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/azure_architecture.md b/docs/azure_architecture.md index bdc9fbe76..b47c19a41 100755 --- a/docs/azure_architecture.md +++ b/docs/azure_architecture.md @@ -1,6 +1,6 @@ # Fence and Microsoft -## Data Access +## Data Access Overview Fence can issue short lived, cloud native credentials to access data in various cloud storage services. For Microsoft, you can use a [signed URL](#Signed-URLs) with [Azure Blob Storage](#Azure-Blob-Storage) and you can authenticate with [Azure AD](#Azure-Active-Directory).