From 6e2769ae84462158b485abea5e09c810096843e4 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Tue, 28 Jan 2020 12:26:08 +0100 Subject: getferdi/ferdi#294 Fix problem when removing workspaces --- app/Controllers/Http/WorkspaceController.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controllers/Http/WorkspaceController.js b/app/Controllers/Http/WorkspaceController.js index dc02e44..a2200a9 100644 --- a/app/Controllers/Http/WorkspaceController.js +++ b/app/Controllers/Http/WorkspaceController.js @@ -73,7 +73,7 @@ class WorkspaceController { // Validate user input const validation = await validateAll(request.all(), { - name: 'required|alpha', + name: 'required', services: 'required|array', }); if (validation.fails()) { @@ -124,12 +124,12 @@ class WorkspaceController { } // Validate user input - const validation = await validateAll(request.all(), { + const validation = await validateAll(params, { id: 'required', }); if (validation.fails()) { return response.status(401).send({ - message: 'Invalid POST arguments', + message: 'Invalid arguments', messages: validation.messages(), status: 401, }); -- cgit v1.2.3-70-g09d2 From ae9e16fb65cc3e48c913b74db4e87e1e64cba05f Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 2 Feb 2020 13:19:48 +0100 Subject: Add automatic Docker Hub build for git tags --- .github/workflows/main.workflow | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .github/workflows/main.workflow diff --git a/.github/workflows/main.workflow b/.github/workflows/main.workflow new file mode 100644 index 0000000..754988d --- /dev/null +++ b/.github/workflows/main.workflow @@ -0,0 +1,9 @@ +workflow "Trigger Docker Hub build" { + on = "tag" + resolves = ["Call Docker Hub"] +} + +action "Call Docker Hub" { + uses = "swinton/httpie.action@master" + args = ["POST", "https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/", ""] +} -- cgit v1.2.3-70-g09d2 From b58d67f99954d1c1ed6dda83f84c34db1a1ff652 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 2 Feb 2020 13:20:38 +0100 Subject: Rename .github/workflows/main.workflow to .github/main.workflow --- .github/main.workflow | 9 +++++++++ .github/workflows/main.workflow | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 .github/main.workflow delete mode 100644 .github/workflows/main.workflow diff --git a/.github/main.workflow b/.github/main.workflow new file mode 100644 index 0000000..754988d --- /dev/null +++ b/.github/main.workflow @@ -0,0 +1,9 @@ +workflow "Trigger Docker Hub build" { + on = "tag" + resolves = ["Call Docker Hub"] +} + +action "Call Docker Hub" { + uses = "swinton/httpie.action@master" + args = ["POST", "https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/", ""] +} diff --git a/.github/workflows/main.workflow b/.github/workflows/main.workflow deleted file mode 100644 index 754988d..0000000 --- a/.github/workflows/main.workflow +++ /dev/null @@ -1,9 +0,0 @@ -workflow "Trigger Docker Hub build" { - on = "tag" - resolves = ["Call Docker Hub"] -} - -action "Call Docker Hub" { - uses = "swinton/httpie.action@master" - args = ["POST", "https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/", ""] -} -- cgit v1.2.3-70-g09d2 From c9f7c4fb6a8094ca9456b7aba5f3d9e441de1f0f Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 2 Feb 2020 13:29:55 +0100 Subject: Add automatic Docker Hub build for releases --- .github/workflows/main.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/main.yml diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml new file mode 100644 index 0000000..c361e8e --- /dev/null +++ b/.github/workflows/main.yml @@ -0,0 +1,18 @@ +name: Trigger Docker Hub build + +on: + release: + types: [published] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Install HTTPie + run: sudo apt-get install httpie + + - name: Send request to Docker Hub to trigger a build + run: > + http post https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/' -- cgit v1.2.3-70-g09d2 From a77d6c42de3aa088c664120041eb0e47c8d2ef77 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 2 Feb 2020 13:30:09 +0100 Subject: Delete main.workflow --- .github/main.workflow | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 .github/main.workflow diff --git a/.github/main.workflow b/.github/main.workflow deleted file mode 100644 index 754988d..0000000 --- a/.github/main.workflow +++ /dev/null @@ -1,9 +0,0 @@ -workflow "Trigger Docker Hub build" { - on = "tag" - resolves = ["Call Docker Hub"] -} - -action "Call Docker Hub" { - uses = "swinton/httpie.action@master" - args = ["POST", "https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/", ""] -} -- cgit v1.2.3-70-g09d2 From a58ffc02be614f5396f69e5c48ead872d059d6b1 Mon Sep 17 00:00:00 2001 From: Bennett Date: Sun, 2 Feb 2020 13:51:05 +0100 Subject: Use env variables --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c361e8e..e21943b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,4 +15,4 @@ jobs: - name: Send request to Docker Hub to trigger a build run: > - http post https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/6a6767a6-7d0d-4050-9055-958552e53b98/call/' + http post https://hub.docker.com/api/build/v1/source/83564f19-c21a-4dae-9690-971aee3b2a3b/trigger/${{ env.HUB_TRIGGER_ID }}/call/' -- cgit v1.2.3-70-g09d2