Skip to content
This repository was archived by the owner on Jan 6, 2018. It is now read-only.

Commit b22b41d

Browse files
committed
Update
1 parent bab3baf commit b22b41d

File tree

9 files changed

+133
-18
lines changed

9 files changed

+133
-18
lines changed

.dockerignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@ LICENSE.md
66
docker-compose.yml
77
tools
88
VERSION.md
9+
Gruntfile.js
10+
package.json

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
.idea
1+
.idea
2+
node_modules

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM dockerizedrupal/base-debian-jessie:1.0.3
1+
FROM dockerizedrupal/base-debian-jessie:1.0.4
22

33
MAINTAINER Jürgen Viljaste <j.viljaste@gmail.com>
44

Gruntfile.js

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
var current_version = '1.0.9';
2+
var new_version = '1.0.10';
3+
4+
module.exports = function(grunt) {
5+
grunt.loadNpmTasks('grunt-replace');
6+
7+
grunt.initConfig({
8+
replace: {
9+
task1: {
10+
options: {
11+
patterns: [
12+
{
13+
match: current_version,
14+
replacement: new_version
15+
}
16+
],
17+
usePrefix: false
18+
},
19+
files: [
20+
{
21+
expand: true,
22+
src: [
23+
'VERSION.md'
24+
]
25+
}
26+
]
27+
},
28+
task2: {
29+
options: {
30+
patterns: [
31+
{
32+
match: 'dockerizedrupal/mysql:' + current_version,
33+
replacement: 'dockerizedrupal/mysql:' + new_version
34+
}
35+
],
36+
usePrefix: false
37+
},
38+
files: [
39+
{
40+
expand: true,
41+
src: [
42+
'docker-compose.yml',
43+
'README.md'
44+
]
45+
}
46+
]
47+
},
48+
task3: {
49+
options: {
50+
patterns: [
51+
{
52+
match: 'git checkout ' + current_version,
53+
replacement: 'git checkout ' + new_version
54+
}
55+
],
56+
usePrefix: false
57+
},
58+
files: [
59+
{
60+
expand: true,
61+
src: [
62+
'README.md'
63+
]
64+
}
65+
]
66+
},
67+
task4: {
68+
options: {
69+
patterns: [
70+
{
71+
match: '"version": "' + current_version + '"',
72+
replacement: '"version": "' + new_version + '"'
73+
}
74+
],
75+
usePrefix: false
76+
},
77+
files: [
78+
{
79+
expand: true,
80+
src: [
81+
'package.json'
82+
]
83+
}
84+
]
85+
},
86+
task5: {
87+
options: {
88+
patterns: [
89+
{
90+
match: 'VERSION="' + current_version + '"',
91+
replacement: 'VERSION="' + new_version + '"'
92+
}
93+
],
94+
usePrefix: false
95+
},
96+
files: [
97+
{
98+
expand: true,
99+
src: [
100+
'tools/mysqldata.sh'
101+
]
102+
}
103+
]
104+
}
105+
}
106+
});
107+
108+
grunt.registerTask('bump', 'replace');
109+
grunt.registerTask('default', 'replace');
110+
};

README.md

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ A [Docker](https://docker.com/) container for [MySQL](http://www.mysql.com/) ser
44

55
## Run the container
66

7-
Using the `docker` command:
8-
97
CONTAINER="mysql-data" && sudo docker run \
108
--name "${CONTAINER}" \
119
-h "${CONTAINER}" \
@@ -22,25 +20,21 @@ Using the `docker` command:
2220
-e SLOW_QUERY_LOG="0" \
2321
-e LONG_QUERY_TIME="1" \
2422
-d \
25-
dockerizedrupal/mysql:1.0.9
26-
27-
Using the `docker-compose` command
28-
29-
TMP="$(mktemp -d)" \
30-
&& git clone https://github.com/dockerizedrupal/docker-mysql.git "${TMP}" \
31-
&& cd "${TMP}" \
32-
&& git checkout 1.0.9 \
33-
&& sudo docker-compose up
23+
dockerizedrupal/mysql:1.0.10
3424

3525
## Build the image
3626

3727
TMP="$(mktemp -d)" \
3828
&& git clone https://github.com/dockerizedrupal/docker-mysql.git "${TMP}" \
3929
&& cd "${TMP}" \
40-
&& git checkout 1.0.9 \
41-
&& sudo docker build -t dockerizedrupal/mysql:1.0.9 . \
30+
&& git checkout 1.0.10 \
31+
&& sudo docker build -t dockerizedrupal/mysql:1.0.10 . \
4232
&& cd -
4333

34+
## Changing the container behaviour on runtime through environment variables
35+
36+
// TODO
37+
4438
## Back up MySQL data
4539

4640
sudo tools/mysqldata backup

VERSION.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.9
1+
1.0.10

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
mysql:
2-
image: dockerizedrupal/mysql:1.0.9
2+
image: dockerizedrupal/mysql:1.0.10
33
hostname: mysql
44
ports:
55
- "3306:3306"

package.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"name": "docker-mysql",
3+
"version": "1.0.10",
4+
"dependencies": {
5+
"grunt": "^0.4.5",
6+
"grunt-replace": "^0.11.0"
7+
}
8+
}

tools/mysqldata.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22

3-
VERSION="1.0.8"
3+
VERSION="1.0.10"
44

55
shopt -s nullglob
66

0 commit comments

Comments
 (0)