From c73e3e7fad6d8e34c982f2e0ce585d4a7b96fa9c Mon Sep 17 00:00:00 2001 From: Isaac Hunter Date: Fri, 30 Aug 2024 08:29:22 -0400 Subject: [PATCH 1/2] minor change to deploy script --- deploy/templates/ec2/server-setup.sh.tpl | 2 +- src/docs/swagger_output.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/templates/ec2/server-setup.sh.tpl b/deploy/templates/ec2/server-setup.sh.tpl index db631c5..352a132 100644 --- a/deploy/templates/ec2/server-setup.sh.tpl +++ b/deploy/templates/ec2/server-setup.sh.tpl @@ -15,7 +15,7 @@ sudo chmod +x /usr/local/bin/docker-compose sudo usermod -aG docker ec2-user # Add user to "docker" group for permissions # Install git -sudo yum install -y git +sudo yum install -y git # Jukebox-Server Configuration ======================== git clone https://github.com/ufosc/Jukebox-Server.git /home/ec2-user/Jukebox-Server diff --git a/src/docs/swagger_output.json b/src/docs/swagger_output.json index 0ca7d78..f6e6790 100644 --- a/src/docs/swagger_output.json +++ b/src/docs/swagger_output.json @@ -32,7 +32,7 @@ "application/json" ], "paths": { - "/": { + "/api": { "get": { "tags": [ "Base" From adc92e11993d3696f8b187909a7ce7c94913d8d2 Mon Sep 17 00:00:00 2001 From: Isaac Hunter Date: Fri, 30 Aug 2024 08:38:29 -0400 Subject: [PATCH 2/2] add docker compose to actions --- .github/workflows/test-api.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/test-api.yml b/.github/workflows/test-api.yml index 1f7bbd7..09b762a 100644 --- a/.github/workflows/test-api.yml +++ b/.github/workflows/test-api.yml @@ -11,6 +11,10 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - name: Setup Docker Compose + run: | + sudo curl -L https://github.com/docker/compose/releases/latest/download/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose - name: Build images run: docker-compose build - name: Run Test