fix test, use aor for java 16

binhex · Sep 24, 2021 · 6e36e16 · 6e36e16
1 parent 463d716
commit 6e36e16
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/workflow-docker-manual.yml b/.github/workflows/workflow-docker-manual.yml
@@ -50,7 +50,7 @@ jobs:
           git_clone_scripts_repo="https://github.com/binhex/scripts.git"
 
           git clone "${git_clone_scripts_repo}" "${git_clone_scripts_dest}"
-          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}" --container-ports '-p 9999:8500' --network-type 'bridge'
+          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ github.event.inputs.tags }}" --container-ports '-p 9999:8000' --network-type 'bridge'
       - name: Push Docker image to Docker Hub
         uses: nick-invision/retry@v2.4.0
         with:

diff --git a/.github/workflows/workflow-docker-release.yml b/.github/workflows/workflow-docker-release.yml
@@ -78,7 +78,7 @@ jobs:
           git_clone_scripts_repo="https://github.com/binhex/scripts.git"
 
           git clone "${git_clone_scripts_repo}" "${git_clone_scripts_dest}"
-          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}" --container-ports '-p 9999:8500' --network-type 'bridge'
+          "${git_clone_scripts_dest}/shell/arch/docker/testrunner.sh" --image-name "ghcr.io/${{ github.repository }}:${{ steps.identify_tag.outputs.tag }}" --container-ports '-p 9999:8000' --network-type 'bridge'
       - name: Push Docker image to Docker Hub
         uses: nick-invision/retry@v2.4.0
         with:

diff --git a/build/root/install.sh b/build/root/install.sh
@@ -35,7 +35,7 @@ fi
 ####
 
 # define pacman packages
-pacman_packages="jre8-openjdk-headless jre11-openjdk-headless"
+pacman_packages="jre8-openjdk-headless jre11-openjdk-headless jre-openjdk-headless"
 
 # install compiled packages using pacman
 if [[ ! -z "${pacman_packages}" ]]; then
@@ -46,7 +46,7 @@ fi
 ####
 
 # define aur packages
-aur_packages="java-openjdk-bin"
+aur_packages=""
 
 # call aur install script (arch user repo)
 source aur.sh