From a53a6494600a4155569aab9c8dbe2419c6a86ca7 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Fri, 5 May 2023 15:54:24 +0100 Subject: [PATCH 01/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 115e4bf..3b14eac 100644 --- a/README.md +++ b/README.md @@ -59,7 +59,7 @@ api: container_name: backend image: medaziz11/uptimekuma_restapi volumes: - - ./db:/db + - ./db:/db:rwx restart: always environment: - KUMA_SERVER=http://kuma:3001 From c4ac533cce45fc13e408ee01eec59905f3f1251a Mon Sep 17 00:00:00 2001 From: zacharyfleck Date: Tue, 16 May 2023 19:00:29 -0400 Subject: [PATCH 02/24] pre create /db directory to prevent permission issues --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index 4e35ab1..1132be9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,6 +38,10 @@ RUN addgroup -S appgroup && adduser -S appuser -G appgroup -s /bin/sh # Copy Python packages and the virtual environment from the builder stage COPY --from=builder --chown=appuser:appgroup /app /app +# Create /db directory to prevent permission issues +RUN mkdir /db && \ + chown appuser:appgroup /db + # Set the working directory to /app WORKDIR /app From 7665e4bd8e63bfc8244154ce8ee3c6f45676f648 Mon Sep 17 00:00:00 2001 From: zacharyfleck Date: Tue, 16 May 2023 19:16:20 -0400 Subject: [PATCH 03/24] update docker compose and README.md --- README.md | 66 ++++++++++++++++++++++++++-------------------- docker-compose.yml | 2 +- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/README.md b/README.md index 3b14eac..1361460 100644 --- a/README.md +++ b/README.md @@ -15,12 +15,19 @@ ### Environment Variables : +#### Required You have to define these ENV VARS in order to connect to your KUMA server. - KUMA_SERVER= - KUMA_USERNAME= - KUMA_PASSWORD= - ADMIN_PASSWORD= + KUMA_SERVER: The URL of your Uptime Kuma instance. ex: https://uptime.example.com + KUMA_USERNAME: The username of your Uptime Kuma user + KUMA_PASSWORD: The password of your Uptime Kuma user + ADMIN_PASSWORD: An admin password to access the API + +#### Optional +Additional configuration variables available + + ACCESS_TOKEN_EXPIRATION: Minutes the access token should be valid. Defaults to 8 days. + SECRET_KEY: A secret value to encode JWTs with #### Note: @@ -46,33 +53,34 @@ You can simply create a docker compose file like this : ```yaml version: "3.9" services: -kuma: - container_name: uptime-kuma - image: louislam/uptime-kuma:latest - ports: - - "3001:3001" - restart: always - volumes: - - uptime-kuma:/app/data - -api: - container_name: backend - image: medaziz11/uptimekuma_restapi - volumes: - - ./db:/db:rwx - restart: always - environment: - - KUMA_SERVER=http://kuma:3001 - - KUMA_USERNAME=test - - KUMA_PASSWORD=123test. - - ADMIN_PASSWORD=admin - depends_on: - - kuma - ports: - - "8000:8000" + kuma: + container_name: uptime-kuma + image: louislam/uptime-kuma:latest + ports: + - "3001:3001" + restart: always + volumes: + - uptime-kuma:/app/data + + api: + container_name: backend + image: medaziz11/uptimekuma_restapi + volumes: + - api:/db + restart: always + environment: + - KUMA_SERVER=http://kuma:3001 + - KUMA_USERNAME=test + - KUMA_PASSWORD=123test. + - ADMIN_PASSWORD=admin + depends_on: + - kuma + ports: + - "8000:8000" volumes: -uptime-kuma: + uptime-kuma: + api: ``` ### In order for the example to work: You have to run kuma first then create your kuma username and password then re-run the compose file. diff --git a/docker-compose.yml b/docker-compose.yml index b86a195..1012b2c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: . # image: medaziz11/uptimekuma_restapi:1.2 volumes: - - ./db:/db:rwx + - api-db:/db restart: always environment: - KUMA_SERVER=${KUMA_SERVER:-http://kuma:3001} From ab12cc79a25ba7b687044522e50e8be2b8df2f62 Mon Sep 17 00:00:00 2001 From: zacharyfleck Date: Tue, 16 May 2023 19:23:50 -0400 Subject: [PATCH 04/24] match volume name to README --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 1012b2c..1786253 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,7 +12,7 @@ services: build: . # image: medaziz11/uptimekuma_restapi:1.2 volumes: - - api-db:/db + - api:/db restart: always environment: - KUMA_SERVER=${KUMA_SERVER:-http://kuma:3001} @@ -26,4 +26,4 @@ services: volumes: uptime-kuma: - api-db: + api: From 563db763b925dbcb0c98c0b6f333d1c4f97bc08b Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:11:23 +0100 Subject: [PATCH 05/24] Update main.yml --- .github/workflows/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0a184e9..87c6218 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -28,7 +28,7 @@ jobs: # Set up Docker Buildx for building images with BuildKit - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 # Cache Docker layers for faster builds - name: Cache Docker layers @@ -43,7 +43,7 @@ jobs: # Log in to Docker Hub using the provided secrets - name: Login to Docker Hub if: github.event_name != 'pull_request' - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} @@ -74,7 +74,7 @@ jobs: # Build, test, and push the Docker image - name: Build, Test, and Push Docker image - uses: docker/build-push-action@v2 + uses: docker/build-push-action@v4 with: context: . platforms: linux/amd64,linux/arm64 From eb70ff4e17cf9bec7e14ce99e709eeadc7d9f822 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:18:18 +0100 Subject: [PATCH 06/24] Update main.yml --- .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 87c6218..ee97b9d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: exit 1 fi - echo "::set-output name=tags::${TAGS}" + echo ""{tags}=${TAGS}" >> $GITHUB_TAGS" # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From 1e0d090455dc945303c9aca74c33801958d9896c Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:21:55 +0100 Subject: [PATCH 07/24] Update main.yml --- .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 ee97b9d..590baf6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -32,7 +32,7 @@ jobs: # Cache Docker layers for faster builds - name: Cache Docker layers - uses: actions/cache@v2 + uses: actions/cache@v3 with: path: ${{ env.CACHE_PATH }} key: ${{ runner.os }}-buildx-${{ github.ref }}-${{ hashFiles('**/Dockerfile') }} From a70053ca0bde7c77c5e10a6db7445da5da94a19e Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:31:53 +0100 Subject: [PATCH 08/24] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 590baf6..7fb5859 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,6 +16,7 @@ on: env: DOCKERHUB_REPO: ${{ vars.DOCKERHUB_REPO || 'medaziz11' }} DOCKERHUB_IMAGE: ${{ vars.DOCKERHUB_IMAGE || 'uptimekuma_restapi' }} + BUILD_TAGS: ${{ vars.BUILD_TAGS }} CACHE_PATH: /tmp/.buildx-cache jobs: @@ -69,8 +70,8 @@ jobs: echo "Error: Unexpected branch or tag" exit 1 fi - - echo ""{tags}=${TAGS}" >> $GITHUB_TAGS" + echo ""{tags}={${TAGS}}" + echo ""{tags}={${TAGS}}" >> $GITHUB_OUTPUT" # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From f766ff454dfddb7016e10d3e0a0695ff37624cf2 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:33:54 +0100 Subject: [PATCH 09/24] Update main.yml --- .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 7fb5859..512296b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: echo "Error: Unexpected branch or tag" exit 1 fi - echo ""{tags}={${TAGS}}" + echo ""{tags}={${TAGS}}"" echo ""{tags}={${TAGS}}" >> $GITHUB_OUTPUT" # Build, test, and push the Docker image From 2feed500af99c2e0d563e2a1a432f27c673938f0 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:36:42 +0100 Subject: [PATCH 10/24] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 512296b..686dfb2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,8 +70,8 @@ jobs: echo "Error: Unexpected branch or tag" exit 1 fi - echo ""{tags}={${TAGS}}"" - echo ""{tags}={${TAGS}}" >> $GITHUB_OUTPUT" + + echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From ad1a06a4e047d2755198833e1fb3de93048779f5 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:42:26 +0100 Subject: [PATCH 11/24] Update main.yml --- .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 686dfb2..b4e6b81 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,7 +70,7 @@ jobs: echo "Error: Unexpected branch or tag" exit 1 fi - + echo "{tags}=${TAGS}" echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT # Build, test, and push the Docker image From 13a60e6f77de8f0320f01a167c7843c07fa87be3 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:51:00 +0100 Subject: [PATCH 12/24] Update main.yml --- .github/workflows/main.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b4e6b81..c4ac58b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,8 +70,9 @@ jobs: echo "Error: Unexpected branch or tag" exit 1 fi - echo "{tags}=${TAGS}" + echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT + echo $GITHUB_OUTPUT # Build, test, and push the Docker image - name: Build, Test, and Push Docker image @@ -80,7 +81,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.image_tags.outputs.tags }} + tags: $GITHUB_OUTPUT.tags cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} From 31c0b37b39f4f19821a69884d54a77a814f01d52 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:53:47 +0100 Subject: [PATCH 13/24] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c4ac58b..dd65412 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo $GITHUB_OUTPUT + echo ${GITHUB_OUTPUT} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image @@ -81,7 +81,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: $GITHUB_OUTPUT.tags + tags: ${{ GITHUB_OUTPUT }} cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} From f12f77b2517d22250ec1e28c6462f043d4e8caa3 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:54:47 +0100 Subject: [PATCH 14/24] Update main.yml --- .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 dd65412..cdf81b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: ${{ GITHUB_OUTPUT }} + tags: ${{ steps.image_tags.outputs.tags }} cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} From 7df7df9072a5477da95e17a3e3d9ca192d8757c4 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 14:55:58 +0100 Subject: [PATCH 15/24] Update main.yml --- .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 cdf81b7..71fea31 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -81,7 +81,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tags: ${{ steps.image_tags.outputs.tags }} + tag: ${{ steps.image_tags.output.tags }} cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} From bf6c8d0302e76a2dd9fe2735183ce52e54dd3aa2 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:24:31 +0100 Subject: [PATCH 16/24] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 71fea31..66e45a6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -72,7 +72,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${GITHUB_OUTPUT} + echo ${steps.image_tags.outputs.tags} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image @@ -81,7 +81,7 @@ jobs: context: . platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} - tag: ${{ steps.image_tags.output.tags }} + tags: ${{ steps.image_tags.outputs.tags }} cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} From c7e9ec14f77b856b317a061cc1b02a911820729d Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:25:41 +0100 Subject: [PATCH 17/24] Update main.yml --- .github/workflows/main.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66e45a6..b3d9e22 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -16,7 +16,6 @@ on: env: DOCKERHUB_REPO: ${{ vars.DOCKERHUB_REPO || 'medaziz11' }} DOCKERHUB_IMAGE: ${{ vars.DOCKERHUB_IMAGE || 'uptimekuma_restapi' }} - BUILD_TAGS: ${{ vars.BUILD_TAGS }} CACHE_PATH: /tmp/.buildx-cache jobs: @@ -72,7 +71,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${steps.image_tags.outputs.tags} + echo ${{ steps.image_tags.outputs.tags }} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From 9d85c5a80f986df6064a669bc41df0e7cbe560fa Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:28:25 +0100 Subject: [PATCH 18/24] Update main.yml --- .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 b3d9e22..167d077 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${{ steps.image_tags.outputs.tags }} + echo ${{ GITHUB_OUTPUT }} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From 8c2cf71e5dab3b48c22a1e3965df35cfa0ce0f65 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:29:46 +0100 Subject: [PATCH 19/24] Update main.yml --- .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 167d077..ceecf79 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${{ GITHUB_OUTPUT }} + echo ${{ steps.image_tags.outputs }} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From e0d7e362170e41565102b1af1189c819eae147a5 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:31:32 +0100 Subject: [PATCH 20/24] Update main.yml --- .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 ceecf79..4b93849 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${{ steps.image_tags.outputs }} + echo ${{ steps.image_tags.output }} # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From c438873b7cb58223c0a4d83561f0625eac5c845e Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:31:54 +0100 Subject: [PATCH 21/24] Update main.yml --- .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 4b93849..cba4422 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -71,7 +71,7 @@ jobs: fi echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo ${{ steps.image_tags.output }} + echo "${{ steps.image_tags.output }}" # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From 20b1f53a93755d8550b505779cfa37cd401cbd80 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:37:01 +0100 Subject: [PATCH 22/24] Update main.yml --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cba4422..f75392b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -70,8 +70,8 @@ jobs: exit 1 fi - echo "{tags}=${TAGS}" >> $GITHUB_OUTPUT - echo "${{ steps.image_tags.output }}" + echo "tags=${TAGS}" >> $GITHUB_OUTPUT + # Build, test, and push the Docker image - name: Build, Test, and Push Docker image From acf720e802f0f0d02b998b1c88968d48b5fc12a4 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:43:17 +0100 Subject: [PATCH 23/24] Update main.yml --- .github/workflows/main.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index f75392b..2b7b247 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,14 +31,14 @@ jobs: uses: docker/setup-buildx-action@v2 # Cache Docker layers for faster builds - - name: Cache Docker layers - uses: actions/cache@v3 - with: - path: ${{ env.CACHE_PATH }} - key: ${{ runner.os }}-buildx-${{ github.ref }}-${{ hashFiles('**/Dockerfile') }} - restore-keys: | - ${{ runner.os }}-buildx-${{ github.ref }}- - ${{ runner.os }}-buildx- +# - name: Cache Docker layers +# uses: actions/cache@v3 +# with: +# path: ${{ env.CACHE_PATH }} +# key: ${{ runner.os }}-buildx-${{ github.ref }}-${{ hashFiles('**/Dockerfile') }} +# restore-keys: | +# ${{ runner.os }}-buildx-${{ github.ref }}- +# ${{ runner.os }}-buildx- # Log in to Docker Hub using the provided secrets - name: Login to Docker Hub @@ -81,7 +81,7 @@ jobs: platforms: linux/amd64,linux/arm64 push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.image_tags.outputs.tags }} - cache-from: type=local,src=${{ env.CACHE_PATH }} +# cache-from: type=local,src=${{ env.CACHE_PATH }} cache-to: type=local,dest=${{ env.CACHE_PATH }} # FUTURE TESTS? From 93c5694e23a593812e65b77e413ce3de0c86ac43 Mon Sep 17 00:00:00 2001 From: MedAziz11 <58366672+MedAziz11@users.noreply.github.com> Date: Sat, 29 Jul 2023 15:48:49 +0100 Subject: [PATCH 24/24] Update requirements.txt --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9298efd..f21c6d9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ python-engineio==4.3.4 python-multipart==0.0.5 python-socketio==5.7.1 pytz==2022.4 -PyYAML==6.0 +pyyaml!=6.0.0,!=5.4.0,!=5.4.1 requests==2.28.1 six==1.16.0 sniffio==1.3.0 @@ -36,4 +36,4 @@ websocket-client==1.4.1 websockets==10.3 asyncio==3.4.3 gunicorn==20.1.0 -uvicorn==0.21.1 \ No newline at end of file +uvicorn==0.21.1