Skip to content

Commit

Permalink
feat(Maven): Add Maven Installation on JDK images
Browse files Browse the repository at this point in the history
  • Loading branch information
hypery2k authored Feb 5, 2023
1 parent 14ff351 commit 2542530
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .bin/_bash.inc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
VERSION=$(cat config.json | grep version | cut -d ':' -f2 | tr -d '"')
VERSION=$(cat config.json | grep version | cut -d ':' -f2 | tr -d '"' | tr -d ' ')
export IMAGE_TAG=${1:-$VERSION}
export MAJOR_DOCKER_TAG=`echo $IMAGE_TAG | perl -0777 -pe 's/^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+))?(?:\+([0-9A-Za-z-]+))?/\1/'`
export MINOR_DOCKER_TAG=`echo $IMAGE_TAG | perl -0777 -pe 's/^([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9A-Za-z-]+))?(?:\+([0-9A-Za-z-]+))?/\1\.\2/'`
Expand Down
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,18 @@ For building these images [Packer](https://www.packer.io/docs/builders/docker.ht

## Development

1. Update version in `config.json`
2. Run `conventional-changelog -p angular -i CHANGELOG.md -s -c config.json && rm config.json && git add CHANGELOG.md && git commit -m "chore: Adding changelog"``
3. Push changes to `develop` branch and wait for CI build
4. Once complete, merge changes to `main` branch and wait for CI build
5. Once complete create a new tag: `v<VERSION>` and create a release on GitHub
1. Set new version
* Update version in `config.json`
* Create release:
```bash
version=$(cat config.json | grep version | cut -d ':' -f2 | tr -d '"' | tr -d ' ')
conventional-changelog -p angular -i CHANGELOG.md -s -c config.json
git add config.json CHANGELOG.md
git commit -m "Relase: Version ${version}"
```
2. Push changes to `develop` branch and wait for CI build
3. Once complete, merge changes to `main` branch and wait for CI build
4. Once complete create a new tag: `v<VERSION>` and create a release on GitHub

### Known Issues

Expand Down
1 change: 1 addition & 0 deletions docker/java/ansible/openjdk11.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
- raw: /usr/bin/printf '\xfe\xed\xfe\xed\x00\x00\x00\x02\x00\x00\x00\x00\xe2\x68\x6e\x45\xfb\x43\xdf\xa4\xd9\x92\xdd\x41\xce\xb6\xb2\x1c\x63\x30\xd7\x92' > /etc/ssl/certs/java/cacerts
- raw: /var/lib/dpkg/info/ca-certificates-java.postinst configure
roles:
- { role: tecris.maven, maven_major: 3 }
- { role: ../../roles/cleanup, tags: [ 'ansible' ], become: yes }
1 change: 1 addition & 0 deletions docker/java/ansible/openjdk17.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@
- raw: /usr/bin/printf '\xfe\xed\xfe\xed\x00\x00\x00\x02\x00\x00\x00\x00\xe2\x68\x6e\x45\xfb\x43\xdf\xa4\xd9\x92\xdd\x41\xce\xb6\xb2\x1c\x63\x30\xd7\x92' > /etc/ssl/certs/java/cacerts
- raw: /var/lib/dpkg/info/ca-certificates-java.postinst configure
roles:
- { role: tecris.maven, maven_major: 3 }
- { role: ../../roles/cleanup, tags: [ 'ansible' ], become: yes }
5 changes: 4 additions & 1 deletion docker/java/roles/requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,7 @@
version: "1.10.0"

- src: srsp.oracle-java
version: "3.2.0"
version: "3.2.0"

- src: tecris.maven
version: "v3.8.7"

0 comments on commit 2542530

Please sign in to comment.