Merge branch 'develop' of github.com:silinternational/mysql-backup-restore into feature/gerry-rig-codeship-steps

Author: mtompset

Dockerfile

@@ -1,11 +1,17 @@
-FROM alpine:3.11
+FROM python:3-alpine
 
+# Current version of s3cmd is in edge/testing repo
+RUN echo https://dl-cdn.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories
+
+# Install everything via repo, because repo & pip installs can break things
 RUN apk update \
  && apk add --no-cache \
             bash \
             mysql-client \
-            python py-pip \
- && pip install s3cmd python-magic
+            py3-magic \
+            py3-dateutil \
+            py3-six \
+            s3cmd
 
 COPY application/ /data/
 WORKDIR /data

README.md

@@ -33,8 +33,7 @@ This image is built automatically on Docker Hub as [silintl/mysql-backup-restore
 You'll need [Docker](https://www.docker.com/get-docker), [Docker Compose](https://docs.docker.com/compose/install/), and [Make](https://www.gnu.org/software/make/).
 
 1. cd .../mysql-backup-restore
-2. mkdir ./mybackups
-3. cp -p test/world.sql.gz ./mybackups
+3. Upload test/world.sql.gz to the S3 bucket.
 4. `make db`  # creates the MySQL DB server
 5. `make restore`  # restores the DB dump file
 6. `docker ps -a`  # get the Container ID of the exited restore container