Skip to content

Remove 2stage install #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bfv merged 2 commits into from
Aug 24, 2026
Merged

Remove 2stage install #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17b5c50
removed 2 stage install
bfv Aug 24, 2026
22998ec
removed adding PROGRESS_PATCH_OE.tar.gz
bfv Aug 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion Dockerfile-gh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file removed PROGRESS_PATCH_OE.tar.gz
View file
Open in desktop
Binary file not shown.
8 changes: 0 additions & 8 deletions scripts/download-openedge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 0 additions & 8 deletions scripts/install-openedge.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 **************************************************************************************"