Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit ef14048

Browse files
Merge branch 'release/5.2.0-beta5'
2 parents f1638c4 + d0531fe commit ef14048

11 files changed

+27
-1
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rebuild:
3131
docker-compose stop
3232
docker-compose pull
3333
docker-compose rm --force app
34-
docker-compose build --no-cache
34+
docker-compose build --no-cache --pull
3535
docker-compose up -d --force-recreate
3636

3737
#############################

‎docker-compose.development.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,15 @@ services:
9292
# - VIRTUAL_HOST=solr.boilerplate.docker
9393
# - VIRTUAL_PORT=8983
9494

95+
#######################################
96+
# Tika server
97+
#######################################
98+
#tika:
99+
# build:
100+
# context: docker/tika/
101+
# ports:
102+
# - 19998:9998
103+
95104
#######################################
96105
# Elasticsearch
97106
#######################################

‎docker/mysql/MariaDB-10.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM mariadb:10
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/MariaDB-5.5.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM mariadb:5.5
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/MySQL-5.5.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM mysql:5.5
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/MySQL-5.6.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM mysql:5.6
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/MySQL-5.7.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM mysql:5.7
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/Percona-5.5.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM percona:5.5
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/Percona-5.6.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM percona:5.6
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

‎docker/mysql/Percona-5.7.Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@
1212
FROM percona:5.7
1313

1414
ADD conf/mysql-docker.cnf /etc/mysql/conf.d/z99-docker.cnf
15+
RUN chown mysql:mysql /etc/mysql/conf.d/z99-docker.cnf \
16+
&& chmod 0644 /etc/mysql/conf.d/z99-docker.cnf

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /