Skip to content

Commit 8d88200

Browse files
authored
Merge pull request #37 from mendix/DES-799_MySQL_Support
Add MySQL docker-compose example for MySQL
2 parents 8f62b23 + 3bc0398 commit 8d88200

File tree

3 files changed

+33
-3
lines changed

3 files changed

+33
-3
lines changed

Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
# Author: Mendix Digital Ecosystems, [email protected]
55
# Version: 1.4
66
FROM ubuntu:trusty
7-
MAINTAINER Mendix Digital Ecosystems <[email protected]>
7+
LABEL Author="Mendix Digital Ecosystems"
8+
LABEL maintainer="[email protected]"
89

910
#Install Python & wget
1011
RUN apt-get -q -y update && \

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ get-sample:
66
unzip downloads/application.mpk -d build/
77

88
build-image:
9-
docker build --no-cache \
9+
docker build \
1010
--build-arg BUILD_PATH=build \
1111
-t mendix/mendix-buildpack:v1.3 .
1212

@@ -16,4 +16,4 @@ test-container:
1616
tests/test-generic.sh tests/docker-compose-azuresql.yml
1717

1818
run-container:
19-
docker-compose -f tests/docker-compose-postgres.yml up
19+
docker-compose -f tests/docker-compose-mysql.yml up

tests/docker-compose-mysql.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
version: '2.3'
2+
3+
services:
4+
mendixapp:
5+
image: mendix/mendix-buildpack:v1.3
6+
healthcheck:
7+
test: ["CMD", "curl", "-f", "http://localhost"]
8+
interval: 15s
9+
retries: 2
10+
start_period: 10s
11+
timeout: 3s
12+
environment:
13+
ADMIN_PASSWORD: Password1!
14+
DATABASE_ENDPOINT: mysql://mendix:mendix@db:3306/mendix
15+
ports:
16+
- 8080:80
17+
- 8090:81
18+
links:
19+
- db
20+
# restart: always
21+
db:
22+
image: mysql:5.7
23+
environment:
24+
- MYSQL_USER=mendix
25+
- MYSQL_PASSWORD=mendix
26+
- MYSQL_DATABASE=mendix
27+
- MYSQL_ROOT_PASSWORD=root
28+
ports:
29+
- 3306:3306

0 commit comments

Comments
 (0)