Skip to content

Commit 788e35b

Browse files
fix: update docker-compose.yml
1 parent c38cfa5 commit 788e35b

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v4
14+
uses: actions/checkout@v5
1515

1616
- name: Load configuration
1717
run: |
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Checkout
33-
uses: actions/checkout@v4
33+
uses: actions/checkout@v5
3434

3535
- name: Load configuration
3636
run: |

.github/workflows/docker-compose.yml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,18 @@ jobs:
1111

1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v5
15+
16+
- name: Load configuration
17+
run: |
18+
echo opensource_COBOL_4J_version="$(jq -r '.opensource_COBOL_4J_version' build-config.json)" >> $GITHUB_ENV
19+
echo Open_COBOL_ESQL_4J_version="$(jq -r '.Open_COBOL_ESQL_4J_version' build-config.json)" >> $GITHUB_ENV
20+
echo version_string_prefix="$(jq -r '.version_string_prefix' build-config.json)" >> $GITHUB_ENV
1521
1622
- name: Launch docker containers
17-
run: cd docker-compose && docker compose up -d
23+
working-directory: docker-compose
24+
run: |
25+
docker compose build \
26+
--build-arg opensource_COBOL_4J_version="$opensource_COBOL_4J_version" \
27+
--build-arg Open_COBOL_ESQL_4J_version="$Open_COBOL_ESQL_4J_version"
28+
docker compose up -d

docker-compose/docker-compose.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@ services:
1212
- "5432:5432"
1313

1414
oc4j_client:
15-
image: opensourcecobol/opensourcecobol4j:20241227
15+
build:
16+
context: ..
17+
dockerfile: Dockerfile
18+
args:
19+
- opensource_COBOL_4J_version=dummy_value
20+
- Open_COBOL_ESQL_4J_version=dummy_value
1621
container_name: oc4j_client
1722
stdin_open: true
1823
tty: true

0 commit comments

Comments
 (0)