Merge pull request #6 from Iapetus999/more_build_fixes

VAULT-893 More build fixes
verygoodsecurity · Feb 11, 2021 · 75f07da · 75f07da
2 parents 8d07402 + e8e0a93
commit 75f07da
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 124 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
 
             export VERSION=${CIRCLE_TAG}
 
-            docker-compose ratelimit-build
+            docker-compose build
             docker-compose push
 
             if [[ $VERSION =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then

diff --git a/.github/stale.yml b/.github/stale.yml
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
diff --git a/.github/workflows/pullrequest.yaml b/.github/workflows/pullrequest.yaml
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -37,9 +37,10 @@ services:
       - binary:/usr/local/bin/
 
   ratelimit:
-    image: alpine:3.6
-    command: >
-        sh -c "until test -f /usr/local/bin/ratelimit; do sleep 5; done; /usr/local/bin/ratelimit"
+    image: quay.io/verygoodsecurity/ratelimit:${VERSION:-latest}
+    build:
+      context: .
+      dockerfile: Dockerfile
     ports:
       - 8080:8080
       - 8081:8081