Skip to content

Commit fb70714

Browse files
committed
create separate compose files for the tests to avoid clashing with devcontainer specific mount
1 parent 9910401 commit fb70714

File tree

5 files changed

+97
-3
lines changed

5 files changed

+97
-3
lines changed

.github/actions/start-hashtopolis/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ runs:
1111
using: "composite"
1212
steps:
1313
- name: Start application containers
14-
working-directory: .devcontainer
14+
working-directory: .github
1515
run: docker compose -f docker-compose.${{ inputs.db_system }}.yml up -d
1616
shell: bash
1717
- name: Install composer dependencies packages

.github/docker-compose.mysql.yml

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
version: "3.7"
2+
services:
3+
hashtopolis-server-dev:
4+
container_name: hashtopolis-server-dev
5+
build:
6+
context: ..
7+
target: hashtopolis-server-dev
8+
args:
9+
- CONTAINER_USER_CMD_PRE
10+
- CONTAINER_USER_CMD_POST
11+
environment:
12+
HASHTOPOLIS_DB_TYPE: mysql
13+
HASHTOPOLIS_DB_USER: hashtopolis
14+
HASHTOPOLIS_DB_PASS: hashtopolis
15+
HASHTOPOLIS_DB_HOST: hashtopolis-db-dev
16+
HASHTOPOLIS_DB_DATABASE: hashtopolis
17+
HASHTOPOLIS_APIV2_ENABLE: 1
18+
depends_on:
19+
- hashtopolis-db-dev
20+
ports:
21+
- "8080:80"
22+
volumes:
23+
- hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
24+
networks:
25+
- hashtopolis_dev
26+
hashtopolis-db-dev:
27+
container_name: hashtopolis-db-dev
28+
image: mysql:8.0
29+
restart: always
30+
ports:
31+
- "3306:3306"
32+
volumes:
33+
- hashtopolis-db-dev:/var/lib/mysql
34+
environment:
35+
MYSQL_ROOT_PASSWORD: hashtopolis
36+
MYSQL_DATABASE: hashtopolis
37+
MYSQL_USER: hashtopolis
38+
MYSQL_PASSWORD: hashtopolis
39+
networks:
40+
- hashtopolis_dev
41+
volumes:
42+
hashtopolis-db-dev:
43+
hashtopolis-server-dev:
44+
45+
networks:
46+
hashtopolis_dev:
47+
name: hashtopolis_dev
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
version: "3.7"
2+
services:
3+
hashtopolis-server-dev:
4+
container_name: hashtopolis-server-dev
5+
build:
6+
context: ..
7+
target: hashtopolis-server-dev
8+
args:
9+
- CONTAINER_USER_CMD_PRE
10+
- CONTAINER_USER_CMD_POST
11+
environment:
12+
HASHTOPOLIS_DB_TYPE: postgres
13+
HASHTOPOLIS_DB_USER: hashtopolis
14+
HASHTOPOLIS_DB_PASS: hashtopolis
15+
HASHTOPOLIS_DB_HOST: hashtopolis-db-dev
16+
HASHTOPOLIS_DB_DATABASE: hashtopolis
17+
HASHTOPOLIS_APIV2_ENABLE: 1
18+
depends_on:
19+
- hashtopolis-db-dev
20+
ports:
21+
- "8080:80"
22+
volumes:
23+
- hashtopolis-server-dev:/usr/local/share/hashtopolis:Z
24+
networks:
25+
- hashtopolis_dev
26+
hashtopolis-db-dev:
27+
container_name: hashtopolis-db-dev
28+
image: postgres:13
29+
restart: always
30+
ports:
31+
- "5432:5432"
32+
volumes:
33+
- hashtopolis-db-dev:/var/lib/postgresql/data
34+
environment:
35+
POSTGRES_DB: hashtopolis
36+
POSTGRES_USER: hashtopolis
37+
POSTGRES_PASSWORD: hashtopolis
38+
networks:
39+
- hashtopolis_dev
40+
41+
volumes:
42+
hashtopolis-db-dev:
43+
hashtopolis-server-dev:
44+
45+
networks:
46+
hashtopolis_dev:
47+
name: hashtopolis_dev
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
hashtopolis_uri: 'http://localhost:80'
1+
hashtopolis_uri: 'http://localhost:8080'
22
username: 'admin'
33
password: 'hashtopolis'

docker-compose.mysql.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ services:
1515
HASHTOPOLIS_DB_DATABASE: $MYSQL_DATABASE
1616
HASHTOPOLIS_ADMIN_USER: $HASHTOPOLIS_ADMIN_USER
1717
HASHTOPOLIS_ADMIN_PASSWORD: $HASHTOPOLIS_ADMIN_PASSWORD
18-
HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE
18+
HASHTOPOLIS_APIV2_ENABLE: $HASHTOPOLIS_APIV2_ENABLE
1919
HASHTOPOLIS_FRONTEND_URLS: $HASHTOPOLIS_FRONTEND_URLS
2020
depends_on:
2121
- db

0 commit comments

Comments
 (0)