diff --git a/Dockerfile b/Dockerfile index ad13d07..0effeb4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,6 @@ COPY --from=eclipse-temurin:17.0.20_8-jdk $JAVA_HOME $JAVA_HOME ENV PATH="${JAVA_HOME}/bin:${PATH}" ADD PROGRESS_OE.tar.gz /install/openedge/ -ADD PROGRESS_PATCH_OE.tar.gz /install/patch/ ADD scripts/install-openedge.sh /install/ COPY oe128-db-dev-response.ini /install/openedge/response.ini diff --git a/Dockerfile-gh b/Dockerfile-gh index 83c2e0b..27e3588 100644 --- a/Dockerfile-gh +++ b/Dockerfile-gh @@ -7,7 +7,6 @@ ENV PATH="${JAVA_HOME}/bin:${PATH}" # the running process (i.e. the github action) is responsible for placing the install .tar # in the correct location ADD PROGRESS_OE.tar.gz /install/openedge/ -ADD PROGRESS_PATCH_OE.tar.gz /install/patch/ ADD scripts/install-openedge.sh /install/ COPY response.ini /install/openedge/response.ini diff --git a/PROGRESS_PATCH_OE.tar.gz b/PROGRESS_PATCH_OE.tar.gz deleted file mode 100644 index 875b42f..0000000 Binary files a/PROGRESS_PATCH_OE.tar.gz and /dev/null differ diff --git a/scripts/download-openedge.sh b/scripts/download-openedge.sh index 90ee1ea..683581f 100755 --- a/scripts/download-openedge.sh +++ b/scripts/download-openedge.sh @@ -3,11 +3,3 @@ echo base: ${OPENEDGE_BASE_VERSION} echo version: ${OPENEDGE_VERSION} docker run -v ${PWD}/src:/target devbfvio/oeinstaller:${OPENEDGE_VERSION} - -if [[ "${OPENEDGE_VERSION}" > "12.8.3" ]]; then - echo ">=12.8.4 we need the base version as well" - mv ${PWD}/src/PROGRESS_OE.tar.gz ${PWD}/src/PROGRESS_PATCH_OE.tar.gz - echo "download base version ${OPENEDGE_BASE_VERSION}" - docker run -v ${PWD}/src:/target devbfvio/oeinstaller:${OPENEDGE_BASE_VERSION} - ls -l ${PWD}/src -fi \ No newline at end of file diff --git a/scripts/install-openedge.sh b/scripts/install-openedge.sh index decbc5e..923eeeb 100755 --- a/scripts/install-openedge.sh +++ b/scripts/install-openedge.sh @@ -4,14 +4,6 @@ echo "******** install base **************************************************************************************" /install/openedge/proinst -b /install/openedge/response.ini -l /install/install_oe.log -n -if [ -f /install/patch/proinst ]; then - echo "Installing patch" - echo -e "\n[Update]\nProgressInstallDir=/usr/dlc\n" >> /install/openedge/response.ini - /install/patch/proinst -b /install/openedge/response.ini -l /install/install_patch.log -n -else - echo "No patch to install" -fi - cat /usr/dlc/version echo "******** done **************************************************************************************"