Skip to content

Commit

Permalink
Sample data and procedure
Browse files Browse the repository at this point in the history
  • Loading branch information
atw527 committed Nov 11, 2017
1 parent 8749eda commit 1cfda68
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 11 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
data/bin
data/lib
8 changes: 8 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,13 @@ Super-long command for dev self-contained system!

```bash
#[user image-match]$
export MASTER=`hostname`
docker-compose -f docker-compose.front.yml -f docker-compose.download.yml -f docker-compose.render.yml -f docker-compose.match.yml -f docker-compose.sandbox.yml up --build
```

When ready to end the test...

```bash
#[user image-match]$
docker-compose -f docker-compose.front.yml -f docker-compose.download.yml -f docker-compose.render.yml -f docker-compose.match.yml -f docker-compose.sandbox.yml down --remove-orphans
```
Binary file added data/templates/sample-01.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/templates/sample-02.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/templates/sample-03.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added data/templates/sample-04.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 6 additions & 6 deletions docker-compose.sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ services:
im-mysql:
image: "mysql:latest"
ports:
- "8086:3306"
- "4206:3306"
expose:
- "3306"
volumes:
Expand All @@ -14,39 +14,39 @@ services:
im-phpmyadmin:
image: "phpmyadmin/phpmyadmin:latest"
ports:
- "8087:80"
- "4280:80"
expose:
- "80"
environment:
PMA_HOSTS: "im-mysql"

im-front:
environment:
MASTER: "a01-docker-02"
MASTER: "${MASTER}"
MYSQL_HOST: "im-mysql"
MYSQL_PORT: 3306
MYSQL_DB: "image_match"
MYSQL_USER: "root"
MYSQL_PASS: "q1w2e3r4"
im-download:
environment:
MASTER: "a01-docker-02"
MASTER: "${MASTER}"
MYSQL_HOST: "im-mysql"
MYSQL_PORT: 3306
MYSQL_DB: "image_match"
MYSQL_USER: "root"
MYSQL_PASS: "q1w2e3r4"
im-render:
environment:
MASTER: "a01-docker-02"
MASTER: "${MASTER}"
MYSQL_HOST: "im-mysql"
MYSQL_PORT: 3306
MYSQL_DB: "image_match"
MYSQL_USER: "root"
MYSQL_PASS: "q1w2e3r4"
im-match:
environment:
MASTER: "a01-docker-02"
MASTER: "${MASTER}"
MYSQL_HOST: "im-mysql"
MYSQL_PORT: 3306
MYSQL_DB: "image_match"
Expand Down
11 changes: 7 additions & 4 deletions permissions.sh
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
#!/bin/bash

# run this in the repo base directory!
# Samba and docker mess up directory and file permissions

chown -R andrew: ./
# Run this in the repo base directory!
# I go up a directory and then back to verify this is in image-match

chmod -R 0644 ./
chmod -R a+X ./
chown -R andrew: ../image-match

chmod -R 0644 ../image-match
chmod -R a+X ../image-match
2 changes: 1 addition & 1 deletion sql/init.sql
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@ ALTER TABLE `tasks`
MODIFY `task_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=5;

INSERT INTO download (video_id) VALUES ('VgK4E6jonVs');
INSERT INTO download (video_id) VALUES ('pEWBV6Ck11g');
INSERT INTO download (video_id) VALUES ('wqJvV2LH1rE');

0 comments on commit 1cfda68

Please sign in to comment.