Merge branch 'master' into add_aws_logging

thinkst · Dec 12, 2023 · f1471e7 · f1471e7
2 parents ba61654 + 2ff2c6a
commit f1471e7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/precommit_tests.yml b/.github/workflows/precommit_tests.yml
@@ -2,7 +2,6 @@ name: Canarytokens Docker Pre-commit Tests
 
 on:
   - "push"
-  - "pull_request"
 
 jobs:
   precommit_tests:

diff --git a/README.md b/README.md
@@ -41,7 +41,9 @@ to [email protected].
 * And correspondingly: `docker compose -f docker-compose.yml up -d`
   or `docker compose -f docker-compose-letsencrypt.yml up -d`
 
-NB: The updated `canarytokens-docker` repo no longer has the Dockerfile for Canarytokens v2, so running that requires using the tagged image `thinkst/canarytokens:v2_latest`. We highly recommened moving to v3. Please contact us if you battling with the migration.
+
+NB: The updated `canarytokens-docker` repo no longer has the Dockerfile for Canarytokens v2, so running that requires using the tagged image `thinkst/canarytokens:v2_latest`. We highly recommend moving to v3. Please contact us if you're battling with the migration.
+
 
 ## Setup (in Ubuntu)
 
@@ -54,7 +56,7 @@ $ cd canarytokens-docker
 ```
 * Install Docker compose (if not already present):
 ```
-$ sudo apt-get install python-pip python-dev
+$ sudo apt-get install python3-pip python3-dev
 $ sudo pip install -U docker-compose
 #if this breaks with PyYAML errors, install the libyaml development package
 # sudo apt-get install libyaml-dev
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,6 @@ name: Canarytokens Docker Pre-commit Tests @@
     on:
       - "push"
-      - "pull_request"
     jobs:
       precommit_tests:
@@ Expand Down @@