Merge branch 'adoptium:master' into master

adoptium · Feb 26, 2024 · 2871136 · 2871136
2 parents 8aed97e + c57a1a2
commit 2871136
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 3 deletions.
diff --git a/.github/workflows/check_dockerstatic.yml b/.github/workflows/check_dockerstatic.yml
@@ -76,12 +76,12 @@ jobs:
       max-parallel: 4
       matrix:
        include:
-         - os: ubuntu16.04
-           dockerfile: "Dockerfile.u1604"
          - os: ubuntu18.04
            dockerfile: "Dockerfile.u1804"
          - os: ubuntu20.04
            dockerfile: "Dockerfile.u2004"
+         - os: ubuntu22.04
+           dockerfile: "Dockerfile.u2204"
     steps:
     - uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # v3.1.0
     - name: Test Dockerfile on ${{ matrix.os }}

diff --git a/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/README.md b/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/README.md
@@ -12,7 +12,28 @@ The DockerStatic ansible role provides allows us to automate the setup of our do
 * [dockerhost-equinix-ubuntu2004-armv8-1](https://ci.adoptium.net/computer/dockerhost-equinix-ubuntu2004-armv8-1/)
 
 
-## Setting up a new DockerStatic container
+## Setting up a new DockerStatic container (recommended)
+
+The [dockerhost.yml](https://github.com/adoptium/infrastructure/blob/master/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/dockernode.yml) playbook is used to deploy docker containers onto our dockerhost machines. 
+
+Example usage:
+
+```
+ansible-playbook -u root -i <host-file> AdoptOpenJDK_Unix_Playbook
+/dockernode.yml -t "deploy" -e "docker_images=u2204,alp319,deb12"
+```
+
+The `docker_images` variable is where the user can specifiy which docker containers to deploy, using the dockerfiles avaiable [here](https://github.com/adoptium/infrastructure/tree/master/ansible/playbooks/AdoptOpenJDK_Unix_Playbook/roles/DockerStatic/Dockerfiles) (which do get updated regularly).
+
+The `dockerhost.yml` playbook can deploy single, multiple and duplicate containers, for example
+
+```
+-e "docker_images=u2204,alp319,u1804,u1804,u1804"
+```
+
+will deploy 1 Ubuntu 22.04 container, 1 Alpine 3.19 container and 3 Ubuntu 18.04 containers.
+
+## Setting up a new DockerStatic container (manually)
 
 If you would like to setup an individual container on one of these machines, follow these instructions: