Skip to content

Commit 74e9038

Browse files
authored
Merge branch 'master' into 0x0elliot/email-app-cloud-fix
2 parents da431d7 + 14a3205 commit 74e9038

File tree

106 files changed

+894
-173
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+894
-173
lines changed

.github/dependabot.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# To get started with Dependabot version updates, you'll need to specify which
2+
# package ecosystems to update and where the package manifests are located.
3+
# Please see the documentation for all configuration options:
4+
# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
5+
6+
version: 2
7+
updates:
8+
- package-ecosystem: "" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+

.github/workflows/ci.yaml renamed to .github/workflows/dockerbuild.yaml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: ci
1+
name: dockerbuild
22

33
on:
44
push:
@@ -23,6 +23,13 @@ jobs:
2323
ret = []
2424
for i in flist:
2525
a,v = i.split('/')
26+
# Look for folders only
27+
if 'unsupported' in v or 'unsupported' in a:
28+
continue
29+
30+
if '.md' in v:
31+
continue
32+
2633
ret.append({'app':a, 'version':v })
2734
print(json.dumps({'include': ret}))
2835
EOF
@@ -38,7 +45,7 @@ jobs:
3845
steps:
3946
-
4047
name: Checkout
41-
uses: actions/checkout@v2
48+
uses: actions/checkout@v4
4249
-
4350
name: Set up QEMU
4451
uses: docker/setup-qemu-action@v1
@@ -47,9 +54,9 @@ jobs:
4754
uses: docker/setup-buildx-action@v1
4855
-
4956
name: Login to DockerHub
50-
uses: docker/login-action@v1
57+
uses: docker/login-action@v3
5158
with:
52-
username: ${{ secrets.DOCKERHUB_LOGIN_USER }}
59+
username: ${{ secrets.DOCKERHUB_USERNAME }}
5360
password: ${{ secrets.DOCKERHUB_TOKEN }}
5461
# Use below configuration for ghcr.io
5562
# with:
@@ -60,28 +67,28 @@ jobs:
6067
name: Build and push Master
6168
if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
6269
id: docker_build_master
63-
uses: docker/build-push-action@v2
70+
uses: docker/build-push-action@v6
6471
with:
6572
context: ${{ matrix.app }}/${{ matrix.version }}
6673
file: ${{ matrix.app }}/${{ matrix.version }}/Dockerfile
6774
platforms: linux/amd64,linux/arm64
6875
push: true
6976
tags: |
70-
${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ matrix.version }}
71-
${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:latest
72-
${{ secrets.DOCKERHUB_USERNAME }}/shuffle:${{ matrix.app }}_${{ matrix.version }}
77+
frikky/${{ matrix.app }}:${{ matrix.version }}
78+
frikky/${{ matrix.app }}:latest
79+
frikky/shuffle:${{ matrix.app }}_${{ matrix.version }}
7380
-
7481
name: Build and push Feature PR
7582
if: ${{ github.event_name == 'pull_request' }}
7683
id: docker_build_feature
77-
uses: docker/build-push-action@v2
84+
uses: docker/build-push-action@v6
7885
with:
7986
context: ${{ matrix.app }}/${{ matrix.version }}
8087
file: ${{ matrix.app }}/${{ matrix.version }}/Dockerfile
8188
platforms: linux/amd64,linux/arm64,linux/386
8289
push: true
8390
tags: |
84-
${{ secrets.DOCKERHUB_USERNAME }}/${{ matrix.app }}:${{ github.head_ref }}
91+
frikky/${{ matrix.app }}:${{ github.head_ref }}
8592
-
8693
name: Image digest
8794
run: |

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Shuffle Apps
2-
All public apps are available in the search, engine either in your local instance or on [https://shuffler.io/search?tab=apps](https://shuffler.io/search?tab=apps). This is a repository for apps to be used in [Shuffle](https://github.com/shuffle/shuffle)
2+
All public apps are available in the search, engine either in your local instance or on [https://shuffler.io/search?tab=apps](https://shuffler.io/search). This is a repository for apps to be used in [Shuffle](https://github.com/shuffle/shuffle)
33

44
**PS:** These apps should be valid with WALKOFF (from NSA), but the SDK is different, meaning you have to change the FIRST line in each Dockerfile (FROM shuffle/shuffle:app_sdk) to make it compatible with Shuffle.
55

66
## App Creation
7-
App creation can be done with the Shuffle App Creator (exports as OpenAPI) or Python, which makes it possible to connect _literally_ any tool. Always prioritize using the App Creator when applicable.
7+
App creation can be done with the Shuffle App Creator (exports as OpenAPI), with AI Generation, or Python - which makes it possible to connect _literally_ any tool. Always prioritize using the App Creator when applicable, as it makes maintaining an app easier.
88

99
![Shuffle-workflow-categories](https://github.com/shuffle/shuffle-workflows/blob/master/images/categories_circle_dark.png)
1010

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
ldap3==2.9.1
2-
requests==2.25.1
2+
requests==2.32.4

archive-org/1.0.0/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests==2.25.1
1+
requests==2.32.4
22
savepagenow==1.1.1
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
requests==2.25.1
1+
requests==2.32.4
22
archiveis==0.0.9
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
boto3==1.20.20
2-
requests==2.25.1
2+
requests==2.32.4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
boto3==1.16.59
22
bson==0.5.10
3-
requests==2.25.1
3+
requests==2.32.4

aws-ec2/1.0.0/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
boto3==1.20.20
2-
requests==2.25.1
2+
requests==2.32.4
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
boto3==1.16.59
2-
requests==2.25.1
2+
requests==2.32.4

0 commit comments

Comments
 (0)