Merge branch '8'

cs50 · Jul 16, 2023 · 3438d1c · 3438d1c
2 parents b341d49 + 8646a6b
commit 3438d1c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,6 @@ deploy:
   provider: script
   script: docker push cs50/mysql:${TRAVIS_BRANCH/master/latest}
   on:
-    condition: "$TRAVIS_BRANCH =~ ^master$"
     all_branches: true
 after_deploy: |
   #!/bin/bash

diff --git a/Dockerfile b/Dockerfile
@@ -1 +1 @@
-FROM mysql:5.6
+FROM mysql:8
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 build:
-	docker build -t cs50/mysql .
+	docker build -t cs50/mysql:8 .
 
 rebuild:
-	docker build --no-cache -t cs50/mysql .
+	docker build --no-cache -t cs50/mysql:8 .
diff --git a/README.md b/README.md
@@ -1 +1 @@
-Wrapper for <https://hub.docker.com/_/mysql/> that locks MySQL to 5.6.x.
+Wrapper for <https://hub.docker.com/_/mysql/> that locks MySQL to 8.x.y.