From 17998b407157e25405e97368b6e99a575df409f7 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Wed, 27 Dec 2023 10:17:29 +0900 Subject: [PATCH 01/19] [Update]: change the version to 1.0.18 (#7) --- Dockerfile | 8 ++++---- README.md | 2 +- docker-compose/docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 302e867..7a74f1a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.17.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.17.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.17.tar.gz &&\ - cd opensourcecobol4j-1.0.17 &&\ + curl -L -o opensourcecobol4j-v1.0.18.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.18.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.0.18.tar.gz &&\ + cd opensourcecobol4j-1.0.18 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.17.tar.gz + rm ../opensourcecobol4j-v1.0.18.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/README.md b/README.md index 162488b..d0df90a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.0.17 +- opensource COBOL 4J: v1.0.18 - Open COBOL ESQL 4J: v1.0.3 In order to "Hello World" program, run the following commands in the docker container diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4b695cf..76d6a72 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.0.17 + image: opensourcecobol/opensourcecobol4j:1.0.18 container_name: oc4j_client stdin_open: true tty: true From c277df733d39ffc98bf4f887e86494cf67a78a8c Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Wed, 31 Jan 2024 09:27:09 +0900 Subject: [PATCH 02/19] Upgrade the version of opensource COBOL 4J to v1.0.19 (#8) --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7a74f1a..d94ea64 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.18.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.18.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.18.tar.gz &&\ - cd opensourcecobol4j-1.0.18 &&\ + curl -L -o opensourcecobol4j-v1.0.19.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.19.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.0.19.tar.gz &&\ + cd opensourcecobol4j-1.0.19 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.18.tar.gz + rm ../opensourcecobol4j-v1.0.19.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ From 9f9789e4398a607044040bf7d76d198fb0f6b0e9 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Wed, 28 Feb 2024 10:33:30 +0900 Subject: [PATCH 03/19] Upgrade the version to 1.0.20 (#9) --- Dockerfile | 8 ++++---- README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d94ea64..03a9609 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.19.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.19.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.19.tar.gz &&\ - cd opensourcecobol4j-1.0.19 &&\ + curl -L -o opensourcecobol4j-v1.0.20.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.20.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.0.20.tar.gz &&\ + cd opensourcecobol4j-1.0.20 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.19.tar.gz + rm ../opensourcecobol4j-v1.0.20.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/README.md b/README.md index d0df90a..e7deeb0 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.0.18 +- opensource COBOL 4J: v1.0.20 - Open COBOL ESQL 4J: v1.0.3 In order to "Hello World" program, run the following commands in the docker container @@ -44,4 +44,4 @@ docker attach oc4j_client The container is for developers opensource COBOL 4J and Open COBOL ESQL 4J, not users of them. -Copyright 2021-2023, Tokyo System House Co., Ltd. +Copyright 2021-2024, Tokyo System House Co., Ltd. From 6eb8219f91a9f93c8655115fdf550f68bf3dbeb8 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 29 Mar 2024 11:57:20 +0900 Subject: [PATCH 04/19] [Update]: update Dockerfile and README.md (#11) Co-authored-by: Yutaro Sakamoto --- Dockerfile | 8 ++++---- README.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 03a9609..d984650 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.20.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.20.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.20.tar.gz &&\ - cd opensourcecobol4j-1.0.20 &&\ + curl -L -o opensourcecobol4j-v1.0.21.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.21.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.0.21.tar.gz &&\ + cd opensourcecobol4j-1.0.21 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.20.tar.gz + rm ../opensourcecobol4j-v1.0.21.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/README.md b/README.md index e7deeb0..88eadee 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.0.20 +- opensource COBOL 4J: v1.0.21 - Open COBOL ESQL 4J: v1.0.3 In order to "Hello World" program, run the following commands in the docker container From 5f26f04035341512936018fe2fd81010ed52f2e2 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Thu, 25 Apr 2024 10:32:57 +0900 Subject: [PATCH 05/19] Update the version of opensource COBOL 4J (#12) --- docker-compose/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 76d6a72..bd24554 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.0.18 + image: opensourcecobol/opensourcecobol4j:1.0.21 container_name: oc4j_client stdin_open: true tty: true From 9a3bc5bdcb30d4829d55c15d11dfeaa166bacd3d Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Tue, 30 Apr 2024 15:58:01 +0900 Subject: [PATCH 06/19] [Update]: update the version number (#13) Co-authored-by: Yutaro Sakamoto --- Dockerfile | 8 ++++---- README.md | 2 +- docker-compose/docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index d984650..cc8d29c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.21.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.21.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.21.tar.gz &&\ - cd opensourcecobol4j-1.0.21 &&\ + curl -L -o opensourcecobol4j-v1.0.22.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.22.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.0.22.tar.gz &&\ + cd opensourcecobol4j-1.0.22 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.21.tar.gz + rm ../opensourcecobol4j-v1.0.22.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/README.md b/README.md index 88eadee..5e1ec5a 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.0.21 +- opensource COBOL 4J: v1.0.22 - Open COBOL ESQL 4J: v1.0.3 In order to "Hello World" program, run the following commands in the docker container diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index bd24554..4fa4a87 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.0.21 + image: opensourcecobol/opensourcecobol4j:1.0.22 container_name: oc4j_client stdin_open: true tty: true From 6e35d6799bc4a50a43b2bc4e3dd5b3177f2c9a58 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Mon, 3 Jun 2024 11:36:47 +0900 Subject: [PATCH 07/19] Upgrade the version to 1.1.0 (#15) --- Dockerfile | 8 ++++---- docker-compose/docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index cc8d29c..5689397 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.0.22.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.0.22.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.0.22.tar.gz &&\ - cd opensourcecobol4j-1.0.22 &&\ + curl -L -o opensourcecobol4j-v1.1.0.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.0.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.0.tar.gz &&\ + cd opensourcecobol4j-1.1.0 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.0.22.tar.gz + rm ../opensourcecobol4j-v1.1.0.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 4fa4a87..2315563 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.0.22 + image: opensourcecobol/opensourcecobol4j:1.1.0 container_name: oc4j_client stdin_open: true tty: true From e34184c365d752054f25a49dc6c4f016eed5efb7 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 28 Jun 2024 10:03:24 +0900 Subject: [PATCH 08/19] [Update]: Upgrade the version to 1.1.1 (#17) --- Dockerfile | 8 ++++---- docker-compose/docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5689397..1943877 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.0.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.0.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.0.tar.gz &&\ - cd opensourcecobol4j-1.1.0 &&\ + curl -L -o opensourcecobol4j-v1.1.1.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.1.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.1.tar.gz &&\ + cd opensourcecobol4j-1.1.1 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.1.0.tar.gz + rm ../opensourcecobol4j-v1.1.1.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 2315563..fecef25 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.1.0 + image: opensourcecobol/opensourcecobol4j:1.1.1 container_name: oc4j_client stdin_open: true tty: true From 3f0060d32960ca702aaee9e1b34c15b97db54895 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 2 Aug 2024 15:12:17 +0900 Subject: [PATCH 09/19] [Update]: use opensource COBOL 4J 1.1.2 (#18) --- Dockerfile | 8 ++++---- docker-compose/docker-compose.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1943877..70dd552 100644 --- a/Dockerfile +++ b/Dockerfile @@ -17,13 +17,13 @@ RUN apt-get update && apt-get install -y sbt # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.1.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.1.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.1.tar.gz &&\ - cd opensourcecobol4j-1.1.1 &&\ + curl -L -o opensourcecobol4j-v1.1.2.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.2.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.2.tar.gz &&\ + cd opensourcecobol4j-1.1.2 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.1.1.tar.gz + rm ../opensourcecobol4j-v1.1.2.tar.gz # Install Open COBOL ESQL 4J RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index fecef25..f348be2 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.1.1 + image: opensourcecobol/opensourcecobol4j:1.1.2 container_name: oc4j_client stdin_open: true tty: true From afeba785fbc454afbf57127818434c47b6e4f899 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 30 Aug 2024 16:29:45 +0900 Subject: [PATCH 10/19] Open COBOL ESQL 4J 1.1.0 (#19) * [Update]: use opensource COBOL 4J 1.1.2 (#18) * [Update]: use Open COBOL ESQL 4J 1.1.0 * [Fix]: fix Dockerfile for developers --- Dockerfile | 30 +++++++++---------- .../Dockerfile | 5 ++-- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/Dockerfile b/Dockerfile index 70dd552..0968a4e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:22.04 +FROM almalinux:9 SHELL ["/bin/bash", "-c"] @@ -7,13 +7,11 @@ ENV CLASSPATH :/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4 RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar' >> ~/.bashrc # install dependencies -RUN apt-get update -RUN apt-get install -y default-jdk build-essential bison flex gettext texinfo autoconf unzip zip gnupg +RUN dnf update -y +RUN dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel + # install sbt -RUN echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | tee /etc/apt/sources.list.d/sbt.list &&\ - echo "deb https://repo.scala-sbt.org/scalasbt/debian /" | tee /etc/apt/sources.list.d/sbt_old.list &&\ - curl -sL "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2EE0EA64E40A89B84B2DF73499E82A75642AC823" | apt-key add -RUN apt-get update && apt-get install -y sbt +RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && echo Y | ./cs setup # install opensourcecobol4j RUN cd /root &&\ @@ -26,18 +24,20 @@ RUN cd /root &&\ rm ../opensourcecobol4j-v1.1.2.tar.gz # Install Open COBOL ESQL 4J +ENV PATH="$PATH:/root/.local/share/coursier/bin" RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ - curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jre6.jar &&\ - cd /root &&\ - curl -L -o Open-COBOL-ESQL-4j-v1.0.3.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v1.0.3.tar.gz &&\ - tar zxvf Open-COBOL-ESQL-4j-v1.0.3.tar.gz &&\ - cd Open-COBOL-ESQL-4j-1.0.3 &&\ - cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ + cd /root/ &&\ + curl -L -o Open-COBOL-ESQL-4j-1.1.0.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v1.1.0.tar.gz &&\ + tar zxvf Open-COBOL-ESQL-4j-1.1.0.tar.gz &&\ + rm Open-COBOL-ESQL-4j-1.1.0.tar.gz &&\ + cd Open-COBOL-ESQL-4j-1.1.0 &&\ + mkdir -p /usr/lib/Open-COBOL-ESQL-4j/ &&\ + curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar &&\ cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib &&\ + cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ ./configure --prefix=/usr/ &&\ make &&\ - make install &&\ - rm ../Open-COBOL-ESQL-4j-v1.0.3.tar.gz + make install # add sample programs ADD cobol_sample /root/cobol_sample diff --git a/docker-compose-for-compiler-developers/Dockerfile b/docker-compose-for-compiler-developers/Dockerfile index 48c25ee..27eea2c 100644 --- a/docker-compose-for-compiler-developers/Dockerfile +++ b/docker-compose-for-compiler-developers/Dockerfile @@ -11,9 +11,9 @@ RUN apt-get update &&\ ENV CLASSPATH :/usr/lib/opensourcecobol4j/sqlite.jar:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar -# install SQLite JDBC driver +# install JDBC drivers RUN mkdir -p /usr/lib/opensourcecobol4j /usr/lib/Open-COBOL-ESQL-4j &&\ - curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar -k https://jdbc.postgresql.org/download/postgresql-42.2.24.jre6.jar &&\ + curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar -k https://jdbc.postgresql.org/download/postgresql-42.2.24.jar &&\ curl -L -o /usr/lib/opensourcecobol4j/sqlite.jar -k https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar # install opensourcecobol4j @@ -31,6 +31,7 @@ RUN cd /root &&\ git clone https://github.com/opensourcecobol/Open-COBOL-ESQL-4j.git &&\ cd Open-COBOL-ESQL-4j &&\ cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib &&\ + cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ ./configure --prefix=/usr/ &&\ make &&\ make install From 37eca4ac196670e2741ed8fcfac69e5e0edfdd13 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Mon, 30 Sep 2024 11:50:22 +0900 Subject: [PATCH 11/19] Open COBOL ESQL 4J 1.1.1 (#20) --- Dockerfile | 8 ++++---- README.md | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0968a4e..0269aee 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,10 +27,10 @@ RUN cd /root &&\ ENV PATH="$PATH:/root/.local/share/coursier/bin" RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ cd /root/ &&\ - curl -L -o Open-COBOL-ESQL-4j-1.1.0.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v1.1.0.tar.gz &&\ - tar zxvf Open-COBOL-ESQL-4j-1.1.0.tar.gz &&\ - rm Open-COBOL-ESQL-4j-1.1.0.tar.gz &&\ - cd Open-COBOL-ESQL-4j-1.1.0 &&\ + curl -L -o Open-COBOL-ESQL-4j-1.1.1.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v1.1.1.tar.gz &&\ + tar zxvf Open-COBOL-ESQL-4j-1.1.1.tar.gz &&\ + rm Open-COBOL-ESQL-4j-1.1.1.tar.gz &&\ + cd Open-COBOL-ESQL-4j-1.1.1 &&\ mkdir -p /usr/lib/Open-COBOL-ESQL-4j/ &&\ curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar &&\ cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib &&\ diff --git a/README.md b/README.md index 5e1ec5a..9d7fbf4 100644 --- a/README.md +++ b/README.md @@ -4,8 +4,8 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.0.22 -- Open COBOL ESQL 4J: v1.0.3 +- opensource COBOL 4J: v1.1.2 +- Open COBOL ESQL 4J: v1.1.1 In order to "Hello World" program, run the following commands in the docker container From 903f89a66f60255857dc803fde89709e6939c916 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Sat, 2 Nov 2024 00:33:37 +0900 Subject: [PATCH 12/19] opensource COBOL 4J 1.1.3 (#21) * feat: opensource COBOL 4J 1.1.3 * fix: docker-compose.yml --- Dockerfile | 8 ++++---- README.md | 2 +- docker-compose/docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0269aee..5f139d3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,13 +15,13 @@ RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x8 # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.2.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.2.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.2.tar.gz &&\ - cd opensourcecobol4j-1.1.2 &&\ + curl -L -o opensourcecobol4j-v1.1.3.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.3.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.3.tar.gz &&\ + cd opensourcecobol4j-1.1.3 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.1.2.tar.gz + rm ../opensourcecobol4j-v1.1.3.tar.gz # Install Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" diff --git a/README.md b/README.md index 9d7fbf4..5f4a5b4 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.1.2 +- opensource COBOL 4J: v1.1.3 - Open COBOL ESQL 4J: v1.1.1 In order to "Hello World" program, run the following commands in the docker container diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index f348be2..b47987a 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:1.1.2 + image: opensourcecobol/opensourcecobol4j:20241031 container_name: oc4j_client stdin_open: true tty: true From 4a78f48b51c2c237847ccadf312023f2cadc7936 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Mon, 4 Nov 2024 18:58:10 +0900 Subject: [PATCH 13/19] Remove unnecessary files (#22) * chore: remove unnecessary files in Dockerfile * chore: remove docker-compose-for-compiler-developers --- ...docker-compose-for-compiler-developers.yml | 17 ------- Dockerfile | 7 +-- README.md | 12 ----- .../Dockerfile | 44 ------------------- .../docker-compose.yml | 28 ------------ 5 files changed, 4 insertions(+), 104 deletions(-) delete mode 100644 .github/workflows/docker-compose-for-compiler-developers.yml delete mode 100644 docker-compose-for-compiler-developers/Dockerfile delete mode 100644 docker-compose-for-compiler-developers/docker-compose.yml diff --git a/.github/workflows/docker-compose-for-compiler-developers.yml b/.github/workflows/docker-compose-for-compiler-developers.yml deleted file mode 100644 index bcfda2b..0000000 --- a/.github/workflows/docker-compose-for-compiler-developers.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: test for docker-compose for compiler developers - -on: - push: - pull_request: - types: [opened, reopened, review_requested, synchronize] - -jobs: - run-tests: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - - name: Launch docker containers - run: cd docker-compose-for-compiler-developers && docker compose up -d diff --git a/Dockerfile b/Dockerfile index 5f139d3..46dd0c8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ FROM almalinux:9 SHELL ["/bin/bash", "-c"] # classpath settings -ENV CLASSPATH :/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/opensourcecobol4j/ocesql4j.jar +ENV CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/opensourcecobol4j/ocesql4j.jar RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar' >> ~/.bashrc # install dependencies @@ -21,7 +21,7 @@ RUN cd /root &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm ../opensourcecobol4j-v1.1.3.tar.gz + rm /root/opensourcecobol4j-v1.1.3.tar.gz # Install Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" @@ -37,7 +37,8 @@ RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ ./configure --prefix=/usr/ &&\ make &&\ - make install + make install &&\ + rm -rf /root/Open-COBOL-ESQL-4j-1.1.1 # add sample programs ADD cobol_sample /root/cobol_sample diff --git a/README.md b/README.md index 5f4a5b4..9292479 100644 --- a/README.md +++ b/README.md @@ -32,16 +32,4 @@ cd /root/ocesql4j_sample make ``` -## Docker containers for compiler developers - -In order to launch the development environment with a database server and a client with opensource COBOL 4J Open COBOL ESQL 4J installed, run the following command. - -```bash -cd docker-compose-compose-for-compiler-developers -docker compose up -d -docker attach oc4j_client -``` - -The container is for developers opensource COBOL 4J and Open COBOL ESQL 4J, not users of them. - Copyright 2021-2024, Tokyo System House Co., Ltd. diff --git a/docker-compose-for-compiler-developers/Dockerfile b/docker-compose-for-compiler-developers/Dockerfile deleted file mode 100644 index 27eea2c..0000000 --- a/docker-compose-for-compiler-developers/Dockerfile +++ /dev/null @@ -1,44 +0,0 @@ -FROM ubuntu:22.04 - -SHELL ["/bin/bash", "-c"] - -# install dependencies of opensourcecobol 4J and Open COBOL ESQL 4J -RUN apt-get update &&\ - apt-get install -y default-jdk build-essential bison flex gettext texinfo libgmp-dev autoconf libtool git unzip zip &&\ - curl -s "https://get.sdkman.io" | bash &&\ - source "/root/.sdkman/bin/sdkman-init.sh" &&\ - sdk install sbt - -ENV CLASSPATH :/usr/lib/opensourcecobol4j/sqlite.jar:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar - -# install JDBC drivers -RUN mkdir -p /usr/lib/opensourcecobol4j /usr/lib/Open-COBOL-ESQL-4j &&\ - curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar -k https://jdbc.postgresql.org/download/postgresql-42.2.24.jar &&\ - curl -L -o /usr/lib/opensourcecobol4j/sqlite.jar -k https://github.com/xerial/sqlite-jdbc/releases/download/3.36.0.3/sqlite-jdbc-3.36.0.3.jar - -# install opensourcecobol4j -RUN cd /root &&\ - git clone https://github.com/opensourcecobol/opensourcecobol4j.git &&\ - cd opensourcecobol4j &&\ - cp /usr/lib/opensourcecobol4j/sqlite.jar libcobj/sqlite-jdbc &&\ - ./configure --prefix=/usr/ &&\ - make &&\ - make install - -# install Open COBOL ESQL 4J -RUN cd /root &&\ - source "/root/.sdkman/bin/sdkman-init.sh" &&\ - git clone https://github.com/opensourcecobol/Open-COBOL-ESQL-4j.git &&\ - cd Open-COBOL-ESQL-4j &&\ - cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib &&\ - cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ - ./configure --prefix=/usr/ &&\ - make &&\ - make install - -# classpath settings -RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/sqlite.jar:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar' >> ~/.bashrc - -WORKDIR /root/ - -CMD ["/bin/bash"] diff --git a/docker-compose-for-compiler-developers/docker-compose.yml b/docker-compose-for-compiler-developers/docker-compose.yml deleted file mode 100644 index 426a5b8..0000000 --- a/docker-compose-for-compiler-developers/docker-compose.yml +++ /dev/null @@ -1,28 +0,0 @@ -version: '3' - -services: - oc4j_db: - image: postgres:13 - container_name: oc4j_db - environment: - - POSTGRES_USER=main_user - - POSTGRES_PASSWORD=password - - POSTGRES_DB=testdb - ports: - - "5432:5432" - - oc4j_client: - image: oc4j_client - container_name: oc4j_client - build: - context: . - dockerfile: Dockerfile - volumes: - - "./share:/root/share" - stdin_open: true - tty: true - depends_on: - oc4j_db: - condition: service_started - logging: - driver: none From 727eb59e10f9ff1e87791c0e70d65df08ec800b8 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 27 Dec 2024 14:25:30 +0900 Subject: [PATCH 14/19] opensource COBOL 4J 1.1.5 (#24) * update: opensource COBOL 4J 1.1.5 * doc: update README.md --- Dockerfile | 8 ++++---- README.md | 2 +- docker-compose/docker-compose.yml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 46dd0c8..99e8a19 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,13 +15,13 @@ RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x8 # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.3.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.3.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.3.tar.gz &&\ - cd opensourcecobol4j-1.1.3 &&\ + curl -L -o opensourcecobol4j-v1.1.5.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.5.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.5.tar.gz &&\ + cd opensourcecobol4j-1.1.5 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm /root/opensourcecobol4j-v1.1.3.tar.gz + rm /root/opensourcecobol4j-v1.1.5.tar.gz # Install Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" diff --git a/README.md b/README.md index 9292479..915b99c 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.1.3 +- opensource COBOL 4J: v1.1.5 - Open COBOL ESQL 4J: v1.1.1 In order to "Hello World" program, run the following commands in the docker container diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index b47987a..fc3c4a9 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,7 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:20241031 + image: opensourcecobol/opensourcecobol4j:20241227 container_name: oc4j_client stdin_open: true tty: true From 83f7c7cd8a061af4314670784524126fbe0561d5 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Tue, 4 Feb 2025 15:48:40 +0900 Subject: [PATCH 15/19] opensource COBOL 4J 1.1.6 (#25) --- .github/workflows/ci.yml | 14 ++++++++++++-- Dockerfile | 8 ++++---- README.md | 2 +- utf8.Dockerfile | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 7 deletions(-) create mode 100644 utf8.Dockerfile diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b85fd3d..8e81e21 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,12 +6,22 @@ on: types: [opened, reopened, review_requested, synchronize] jobs: - run-tests: + build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Build a docker image run: docker build -t opensourcecobol/opensourcecobol4j . + + utf8-build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Build a docker image + run: docker build -t opensourcecobol/opensourcecobol4j:utf8 . -f utf8.Dockerfile \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 99e8a19..1caefea 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,13 +15,13 @@ RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x8 # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.5.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.5.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.5.tar.gz &&\ - cd opensourcecobol4j-1.1.5 &&\ + curl -L -o opensourcecobol4j-v1.1.6.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.6.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.6.tar.gz &&\ + cd opensourcecobol4j-1.1.6 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm /root/opensourcecobol4j-v1.1.5.tar.gz + rm /root/opensourcecobol4j-v1.1.6.tar.gz # Install Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" diff --git a/README.md b/README.md index 915b99c..fc08284 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.1.5 +- opensource COBOL 4J: v1.1.6 - Open COBOL ESQL 4J: v1.1.1 In order to "Hello World" program, run the following commands in the docker container diff --git a/utf8.Dockerfile b/utf8.Dockerfile new file mode 100644 index 0000000..657aff3 --- /dev/null +++ b/utf8.Dockerfile @@ -0,0 +1,32 @@ +FROM almalinux:9 + +SHELL ["/bin/bash", "-c"] + +# classpath settings +ENV CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar +RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar' >> ~/.bashrc + +# install dependencies +RUN dnf update -y +RUN dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel + +# install sbt +RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && echo Y | ./cs setup + +# install opensourcecobol4j +RUN cd /root &&\ + curl -L -o opensourcecobol4j-v1.1.6.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.6.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.6.tar.gz &&\ + cd opensourcecobol4j-1.1.6 &&\ + ./configure --prefix=/usr/ --enable-utf8 &&\ + touch cobj/*.m4 &&\ + make &&\ + make install &&\ + rm /root/opensourcecobol4j-v1.1.6.tar.gz + +# add sample programs +ADD cobol_sample /root/cobol_sample + +WORKDIR /root/ + +CMD ["/bin/bash"] From c0e1a56befadb7b0cc9a8609f2c52fb9fe405544 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Fri, 28 Feb 2025 17:20:09 +0900 Subject: [PATCH 16/19] opensource COBOL 4J 1.1.7 (#26) --- Dockerfile | 8 ++++---- README.md | 2 +- utf8.Dockerfile | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1caefea..b164bb0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,13 +15,13 @@ RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x8 # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.6.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.6.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.6.tar.gz &&\ - cd opensourcecobol4j-1.1.6 &&\ + curl -L -o opensourcecobol4j-v1.1.7.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.7.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.7.tar.gz &&\ + cd opensourcecobol4j-1.1.7 &&\ ./configure --prefix=/usr/ &&\ make &&\ make install &&\ - rm /root/opensourcecobol4j-v1.1.6.tar.gz + rm /root/opensourcecobol4j-v1.1.7.tar.gz # Install Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" diff --git a/README.md b/README.md index fc08284..ce5fbdf 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ Versions : - OS: Ubuntu -- opensource COBOL 4J: v1.1.6 +- opensource COBOL 4J: v1.1.7 - Open COBOL ESQL 4J: v1.1.1 In order to "Hello World" program, run the following commands in the docker container diff --git a/utf8.Dockerfile b/utf8.Dockerfile index 657aff3..ea3a280 100644 --- a/utf8.Dockerfile +++ b/utf8.Dockerfile @@ -15,14 +15,14 @@ RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x8 # install opensourcecobol4j RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.6.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.6.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.6.tar.gz &&\ - cd opensourcecobol4j-1.1.6 &&\ + curl -L -o opensourcecobol4j-v1.1.7.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.7.tar.gz &&\ + tar zxvf opensourcecobol4j-v1.1.7.tar.gz &&\ + cd opensourcecobol4j-1.1.7 &&\ ./configure --prefix=/usr/ --enable-utf8 &&\ touch cobj/*.m4 &&\ make &&\ make install &&\ - rm /root/opensourcecobol4j-v1.1.6.tar.gz + rm /root/opensourcecobol4j-v1.1.7.tar.gz # add sample programs ADD cobol_sample /root/cobol_sample From 13cd45c18b8a6f2b4f42fd471db17025660a1516 Mon Sep 17 00:00:00 2001 From: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> Date: Thu, 2 Oct 2025 13:05:14 +0900 Subject: [PATCH 17/19] Minimize Docker images and automate relasing docker images (#31) * Initial plan * Implement multi-stage Docker builds to minimize image size Co-authored-by: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> * Add comprehensive size reduction summary documentation Co-authored-by: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> * Remove OPTIMIZATION.md and SIZE_REDUCTION_SUMMARY.md documentation files Co-authored-by: yutaro-sakamoto <80912876+yutaro-sakamoto@users.noreply.github.com> * fix: Dockerfile and utf8.Dockerfile * build: add build configuration files * fix: update docker-compose.yml * ci: run example programs in a Docker container * chore: rename Makefile to run.sh * fix: copying built files * fix: CLASSPATH defined in Dockerfile * ci: improve workflow triggers * ci: add experimental code that pushes docker images to DockerHub * fix: create an image with the tag `latest` * ci: deploy only when workflow_dispatch * ci: change settings to disable debug mode * build: change build-config.json to release new images * doc: update README.md * fix: apply copilot suggestions * chore: update Dockerfile * ci: add checks of versions of installed software --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> --- .github/workflows/ci.yml | 76 +++++++++++++++++-- .github/workflows/docker-compose.yml | 21 +++++- Dockerfile | 108 ++++++++++++++++++--------- README.md | 45 +++++------ build-config.json | 5 ++ docker-compose/docker-compose.yml | 7 +- ocesql4j_sample/Makefile | 6 -- ocesql4j_sample/run.sh | 5 ++ utf8.Dockerfile | 57 +++++++++----- 9 files changed, 235 insertions(+), 95 deletions(-) create mode 100644 build-config.json delete mode 100644 ocesql4j_sample/Makefile create mode 100644 ocesql4j_sample/run.sh diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e81e21..cf75522 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,9 +1,16 @@ -name: test +name: Build and Push Docker Image on: push: pull_request: - types: [opened, reopened, review_requested, synchronize] + types: [opened, reopened, synchronize] + workflow_dispatch: + inputs: + push_to_dockerhub: + description: 'Push to Docker Hub' + required: false + default: 'false' + type: boolean jobs: build: @@ -11,17 +18,74 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 + + - name: Load configuration + run: | + echo opensource_COBOL_4J_version="$(jq -r '.opensource_COBOL_4J_version' build-config.json)" >> $GITHUB_ENV + echo Open_COBOL_ESQL_4J_version="$(jq -r '.Open_COBOL_ESQL_4J_version' build-config.json)" >> $GITHUB_ENV + echo version_string_prefix="$(jq -r '.version_string_prefix' build-config.json)" >> $GITHUB_ENV - name: Build a docker image - run: docker build -t opensourcecobol/opensourcecobol4j . + run: | + docker build -t opensourcecobol/opensourcecobol4j:"$version_string_prefix" . \ + --build-arg opensource_COBOL_4J_version="$opensource_COBOL_4J_version" \ + --build-arg Open_COBOL_ESQL_4J_version="$Open_COBOL_ESQL_4J_version" + + - name: Copy Docker image + run: | + docker tag opensourcecobol/opensourcecobol4j:"$version_string_prefix" opensourcecobol/opensourcecobol4j:latest + + - name: Check the version of installed software + run: | + docker run --rm opensourcecobol/opensourcecobol4j:latest sh -c "cobj --version | grep 'opensource COBOL 4J $opensource_COBOL_4J_version'" + docker run --rm opensourcecobol/opensourcecobol4j:latest sh -c "! cobj --version | grep 'unicode/utf-8 support'" + docker run --rm opensourcecobol/opensourcecobol4j:latest sh -c "ocesql --version | grep 'Version $Open_COBOL_ESQL_4J_version'" + + - name: Login to Docker Hub + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push to Docker Hub + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + run: | + docker push opensourcecobol/opensourcecobol4j:"$version_string_prefix" + docker push opensourcecobol/opensourcecobol4j:latest utf8-build: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4 + uses: actions/checkout@v5 + + - name: Load configuration + run: | + echo opensource_COBOL_4J_version="$(jq -r '.opensource_COBOL_4J_version' build-config.json)" >> $GITHUB_ENV + echo Open_COBOL_ESQL_4J_version="$(jq -r '.Open_COBOL_ESQL_4J_version' build-config.json)" >> $GITHUB_ENV + echo version_string_prefix="$(jq -r '.version_string_prefix' build-config.json)" >> $GITHUB_ENV - name: Build a docker image - run: docker build -t opensourcecobol/opensourcecobol4j:utf8 . -f utf8.Dockerfile \ No newline at end of file + run: | + docker build -t opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" . -f utf8.Dockerfile \ + --build-arg opensource_COBOL_4J_version="$opensource_COBOL_4J_version" + + - name: Check the version of installed software + run: | + docker run --rm opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" sh -c "cobj --version | grep 'opensource COBOL 4J $opensource_COBOL_4J_version'" + docker run --rm opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" sh -c "cobj --version | grep 'unicode/utf-8 support'" + + - name: Login to Docker Hub + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push to Docker Hub + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + run: | + docker push opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" diff --git a/.github/workflows/docker-compose.yml b/.github/workflows/docker-compose.yml index b0622a7..da01271 100644 --- a/.github/workflows/docker-compose.yml +++ b/.github/workflows/docker-compose.yml @@ -11,7 +11,24 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v5 + + - name: Load configuration + run: | + echo opensource_COBOL_4J_version="$(jq -r '.opensource_COBOL_4J_version' build-config.json)" >> $GITHUB_ENV + echo Open_COBOL_ESQL_4J_version="$(jq -r '.Open_COBOL_ESQL_4J_version' build-config.json)" >> $GITHUB_ENV + echo version_string_prefix="$(jq -r '.version_string_prefix' build-config.json)" >> $GITHUB_ENV - name: Launch docker containers - run: cd docker-compose && docker compose up -d + working-directory: docker-compose + run: | + docker compose build \ + --build-arg opensource_COBOL_4J_version="$opensource_COBOL_4J_version" \ + --build-arg Open_COBOL_ESQL_4J_version="$Open_COBOL_ESQL_4J_version" + docker compose up -d + + - name: Run example programs + working-directory: docker-compose + run: | + docker cp ../ocesql4j_sample oc4j_client:/tmp/ocesql4j_sample + docker exec oc4j_client bash -c "cd /tmp/ocesql4j_sample && sh run.sh" diff --git a/Dockerfile b/Dockerfile index b164bb0..a2e3e48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,44 +1,82 @@ -FROM almalinux:9 +# Build stage +FROM almalinux:9 AS builder -SHELL ["/bin/bash", "-c"] +ARG opensource_COBOL_4J_version=dummy_value Open_COBOL_ESQL_4J_version=dummy_value -# classpath settings -ENV CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/opensourcecobol4j/ocesql4j.jar -RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar' >> ~/.bashrc +SHELL ["/bin/bash", "-c"] -# install dependencies -RUN dnf update -y -RUN dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel +# install build dependencies +RUN dnf update -y && \ + dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel && \ + dnf clean all # install sbt -RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && echo Y | ./cs setup - -# install opensourcecobol4j -RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.7.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.7.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.7.tar.gz &&\ - cd opensourcecobol4j-1.1.7 &&\ - ./configure --prefix=/usr/ &&\ - make &&\ - make install &&\ - rm /root/opensourcecobol4j-v1.1.7.tar.gz - -# Install Open COBOL ESQL 4J +RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && \ + chmod +x cs && \ + echo Y | ./cs setup + +# build opensourcecobol4j +RUN cd /root && \ + curl -L -o opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v${opensource_COBOL_4J_version}.tar.gz && \ + tar zxvf opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz && \ + cd opensourcecobol4j-${opensource_COBOL_4J_version} && \ + ./configure --prefix=/usr/ && \ + make && \ + make install && \ + rm -rf /root/opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz /root/opensourcecobol4j-${opensource_COBOL_4J_version} + +# Download postgresql jar +RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j/ && \ + curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar + +# Build Open COBOL ESQL 4J ENV PATH="$PATH:/root/.local/share/coursier/bin" -RUN mkdir -p /usr/lib/Open-COBOL-ESQL-4j &&\ - cd /root/ &&\ - curl -L -o Open-COBOL-ESQL-4j-1.1.1.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v1.1.1.tar.gz &&\ - tar zxvf Open-COBOL-ESQL-4j-1.1.1.tar.gz &&\ - rm Open-COBOL-ESQL-4j-1.1.1.tar.gz &&\ - cd Open-COBOL-ESQL-4j-1.1.1 &&\ - mkdir -p /usr/lib/Open-COBOL-ESQL-4j/ &&\ - curl -L -o /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar https://jdbc.postgresql.org/download/postgresql-42.2.24.jar &&\ - cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib &&\ - cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib &&\ - ./configure --prefix=/usr/ &&\ - make &&\ - make install &&\ - rm -rf /root/Open-COBOL-ESQL-4j-1.1.1 +RUN cd /root/ && \ + curl -L -o Open-COBOL-ESQL-4j-${Open_COBOL_ESQL_4J_version}.tar.gz https://github.com/opensourcecobol/Open-COBOL-ESQL-4j/archive/refs/tags/v${Open_COBOL_ESQL_4J_version}.tar.gz && \ + tar zxvf Open-COBOL-ESQL-4j-${Open_COBOL_ESQL_4J_version}.tar.gz && \ + cd Open-COBOL-ESQL-4j-${Open_COBOL_ESQL_4J_version} && \ + cp /usr/lib/opensourcecobol4j/libcobj.jar dblibj/lib && \ + cp /usr/lib/Open-COBOL-ESQL-4j/postgresql.jar dblibj/lib && \ + ./configure --prefix=/usr/ && \ + make && \ + make install && \ + rm -rf /root/Open-COBOL-ESQL-4j-${Open_COBOL_ESQL_4J_version}.tar.gz /root/Open-COBOL-ESQL-4j-${Open_COBOL_ESQL_4J_version} + +# Runtime stage +FROM almalinux:9 + +ARG opensource_COBOL_4J_version=dummy_value Open_COBOL_ESQL_4J_version=dummy_value + +SHELL ["/bin/bash", "-c"] + +# install runtime dependencies only +RUN dnf update -y && \ + dnf install -y java-11-openjdk-devel && \ + dnf clean all && \ + rm -rf /var/cache/dnf/* + +# create required directories +RUN mkdir -p /usr/lib/opensourcecobol4j \ + /usr/lib/Open-COBOL-ESQL-4j \ + /usr/bin/ \ + /usr/include/ \ + /usr/lib/share + +# copy built files from builder stage +COPY --from=builder /usr/lib/opensourcecobol4j/ /usr/lib/opensourcecobol4j/ +COPY --from=builder /usr/lib/Open-COBOL-ESQL-4j/ /usr/lib/Open-COBOL-ESQL-4j/ +COPY --from=builder /usr/bin/cob-config /usr/bin/cob-config +COPY --from=builder /usr/bin/cobj /usr/bin/cobj +COPY --from=builder /usr/bin/cobj-api /usr/bin/cobj-api +COPY --from=builder /usr/bin/cobj-idx /usr/bin/cobj-idx +COPY --from=builder /usr/bin/cobjrun /usr/bin/cobjrun +COPY --from=builder /usr/bin/ocesql /usr/bin/ocesql +COPY --from=builder /usr/include/libcobj.h /usr/include/libcobj.h +COPY --from=builder /usr/share/opensource-cobol-4j-${opensource_COBOL_4J_version} /usr/share/opensource-cobol-4j-${opensource_COBOL_4J_version} + +# classpath settings +ENV CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar +RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar:/usr/lib/Open-COBOL-ESQL-4j/postgresql.jar:/usr/lib/Open-COBOL-ESQL-4j/ocesql4j.jar' >> ~/.bashrc # add sample programs ADD cobol_sample /root/cobol_sample diff --git a/README.md b/README.md index ce5fbdf..f4f3aa3 100644 --- a/README.md +++ b/README.md @@ -1,35 +1,26 @@ -# opensource COBOL 4J development environment (Docker) +このリポジトリでは、GitHub Actionsを使用して、opensource COBOL 4J及びOpen COBOL ESQL 4JのインストールされたDockerイメージのリリースを行います。 -## Docker image -Versions : +# リリース手順 -- OS: Ubuntu -- opensource COBOL 4J: v1.1.7 -- Open COBOL ESQL 4J: v1.1.1 +## build-config.jsonの編集 -In order to "Hello World" program, run the following commands in the docker container +リリースするバージョンに合わせて、build-config.jsonを編集します。 +* opensource_COBOL_4J_version: Dockerイメージにインストールするopensource COBOL 4Jのバージョン +* Open_COBOL_ESQL_4J_version: DockerイメージにインストールするOpen COBOL ESQL 4Jのバージョン +* version_string_prefix: リリースするDockerイメージタグのプレフィックス + * 例えば20250929を指定すると、以下の3つのタグを持つDockerイメージがビルドされ、Docker Hubにプッシュされます。 + * opensourcecobol/opensourcecobol4j:20250929 + * opensourcecobol/opensourcecobol4j:20250929-utf8 + * opensourcecobol/opensourcecobol4j:latest -``` -cd /root/cobol_sample -cobj HELLO.cbl -java HELLO -``` +## ワークフローの手動実行 -## Docker containers +[公式ドキュメント](https://docs.github.com/ja/actions/how-tos/manage-workflow-runs/manually-run-a-workflow)を参考にして、ワークフローを手動で実行します。 -In order to launch the environment with a database server and a client with opensource COBOL 4J Open COBOL ESQL 4J installed, run the following command. +* ワークフロー名: `Build and Push Docker Image` +* ブランチ: `main` +* 入力パラメータ: `push_to_dockerhub`に`true`を指定 -```bash -cd docker-compose -docker compose up -d -docker attach oc4j_client -``` +これによりDockerイメージがビルドされ、Docker HubにDockerイメージがプッシュされます。 -Run the following in the docker container and execute sample programs of Open COBOL ESQL 4J. - -```bash -cd /root/ocesql4j_sample -make -``` - -Copyright 2021-2024, Tokyo System House Co., Ltd. +Copyright 2021-2025, Tokyo System House Co., Ltd. diff --git a/build-config.json b/build-config.json new file mode 100644 index 0000000..b7e6ada --- /dev/null +++ b/build-config.json @@ -0,0 +1,5 @@ +{ + "opensource_COBOL_4J_version": "1.1.13", + "Open_COBOL_ESQL_4J_version": "1.1.2", + "version_string_prefix": "20250929" +} \ No newline at end of file diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index fc3c4a9..96f823d 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -12,7 +12,12 @@ services: - "5432:5432" oc4j_client: - image: opensourcecobol/opensourcecobol4j:20241227 + build: + context: .. + dockerfile: Dockerfile + args: + - opensource_COBOL_4J_version=dummy_value + - Open_COBOL_ESQL_4J_version=dummy_value container_name: oc4j_client stdin_open: true tty: true diff --git a/ocesql4j_sample/Makefile b/ocesql4j_sample/Makefile deleted file mode 100644 index d002e11..0000000 --- a/ocesql4j_sample/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -all: - ocesql INSERTTBL.cbl INSERTTBL.cob - ocesql FETCHTBL.cbl FETCHTBL.cob - cobj *.cob - java INSERTTBL - java FETCHTBL diff --git a/ocesql4j_sample/run.sh b/ocesql4j_sample/run.sh new file mode 100644 index 0000000..0decff5 --- /dev/null +++ b/ocesql4j_sample/run.sh @@ -0,0 +1,5 @@ +ocesql INSERTTBL.cbl INSERTTBL.cob +ocesql FETCHTBL.cbl FETCHTBL.cob +cobj *.cob +java INSERTTBL +java FETCHTBL diff --git a/utf8.Dockerfile b/utf8.Dockerfile index ea3a280..5357d1b 100644 --- a/utf8.Dockerfile +++ b/utf8.Dockerfile @@ -1,29 +1,50 @@ +# Build stage +FROM almalinux:9 AS builder + +ARG opensource_COBOL_4J_version=dummy_value + +SHELL ["/bin/bash", "-c"] + +# install build dependencies +RUN dnf update -y && \ + dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel && \ + dnf clean all + +# install sbt +RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && \ + chmod +x cs && \ + echo Y | ./cs setup + +# build opensourcecobol4j +RUN cd /root && \ + curl -L -o opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v${opensource_COBOL_4J_version}.tar.gz && \ + tar zxvf opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz && \ + cd opensourcecobol4j-${opensource_COBOL_4J_version} && \ + mkdir -p /tmp/usr/ &&\ + ./configure --prefix=/tmp/usr/ --enable-utf8 && \ + touch cobj/*.m4 && \ + make && \ + make install && \ + rm -rf /root/opensourcecobol4j-v${opensource_COBOL_4J_version}.tar.gz /root/opensourcecobol4j-${opensource_COBOL_4J_version} + +# Runtime stage FROM almalinux:9 SHELL ["/bin/bash", "-c"] +# install runtime dependencies only +RUN dnf update -y && \ + dnf install -y java-11-openjdk-devel && \ + dnf clean all && \ + rm -rf /var/cache/dnf/* + +# copy built files from builder stage +COPY --from=builder /tmp/usr/ /usr/ + # classpath settings ENV CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar RUN echo 'export CLASSPATH=:/usr/lib/opensourcecobol4j/libcobj.jar' >> ~/.bashrc -# install dependencies -RUN dnf update -y -RUN dnf install -y gcc make bison flex automake autoconf diffutils gettext java-11-openjdk-devel - -# install sbt -RUN curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && echo Y | ./cs setup - -# install opensourcecobol4j -RUN cd /root &&\ - curl -L -o opensourcecobol4j-v1.1.7.tar.gz https://github.com/opensourcecobol/opensourcecobol4j/archive/refs/tags/v1.1.7.tar.gz &&\ - tar zxvf opensourcecobol4j-v1.1.7.tar.gz &&\ - cd opensourcecobol4j-1.1.7 &&\ - ./configure --prefix=/usr/ --enable-utf8 &&\ - touch cobj/*.m4 &&\ - make &&\ - make install &&\ - rm /root/opensourcecobol4j-v1.1.7.tar.gz - # add sample programs ADD cobol_sample /root/cobol_sample From c389bdf0cab8f0fc84596aefa45cdabbfc302c49 Mon Sep 17 00:00:00 2001 From: Yutaro Sakamoto Date: Thu, 2 Oct 2025 04:17:45 +0000 Subject: [PATCH 18/19] ci: fix ci.yml --- .github/workflows/ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cf75522..696a37b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,14 +43,14 @@ jobs: docker run --rm opensourcecobol/opensourcecobol4j:latest sh -c "ocesql --version | grep 'Version $Open_COBOL_ESQL_4J_version'" - name: Login to Docker Hub - if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == true uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Push to Docker Hub - if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == true run: | docker push opensourcecobol/opensourcecobol4j:"$version_string_prefix" docker push opensourcecobol/opensourcecobol4j:latest @@ -79,13 +79,13 @@ jobs: docker run --rm opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" sh -c "cobj --version | grep 'unicode/utf-8 support'" - name: Login to Docker Hub - if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == true uses: docker/login-action@v3 with: username: ${{ secrets.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Push to Docker Hub - if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == 'true' + if: github.ref == 'refs/heads/main' && github.event_name == 'workflow_dispatch' && inputs.push_to_dockerhub == true run: | docker push opensourcecobol/opensourcecobol4j:utf8-"$version_string_prefix" From 6282a09de350303497a56a8a2a77072af3621a55 Mon Sep 17 00:00:00 2001 From: Takuto Hashimoto Date: Fri, 31 Oct 2025 16:17:11 +0900 Subject: [PATCH 19/19] update config.json (#32) --- build-config.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-config.json b/build-config.json index b7e6ada..e010073 100644 --- a/build-config.json +++ b/build-config.json @@ -1,5 +1,5 @@ { - "opensource_COBOL_4J_version": "1.1.13", + "opensource_COBOL_4J_version": "1.1.14", "Open_COBOL_ESQL_4J_version": "1.1.2", - "version_string_prefix": "20250929" + "version_string_prefix": "20251031" } \ No newline at end of file