Skip to content
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.

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

[DPE-5101] Release 3.9.2 #35

Merged
merged 1 commit into from
Sep 10, 2024
Merged
Changes from all commits
Commits
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
14 changes: 7 additions & 7 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
---
name: charmed-zookeeper # the name of your ROCK
base: ubuntu@22.04 # the base environment for this ROCK
version: '3.8.4' # just for humans. Semantic versioning is recommended
version: '3.9.2' # just for humans. Semantic versioning is recommended
summary: Charmed ZooKeeper ROCK OCI # 79 char long summary
description: |
This is an OCI image that bundles Apache ZooKeeper together with other tools
Expand All @@ -18,7 +18,7 @@ platforms: # The platforms this ROCK should be built on and run on
amd64:

environment:
JAVA_HOME: /usr/lib/jvm/java-18-openjdk-amd64
JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
ZOO_LOG_DIR: /var/log/zookeeper
ZOOCFGDIR: /etc/zookeeper

Expand All @@ -36,17 +36,17 @@ parts:
zookeeper:
plugin: nil
stage-packages:
- openjdk-18-jre-headless
- openjdk-11-jre-headless
- libpsl5
- curl
build-environment:
- JAVA_HOME: /usr/lib/jvm/java-18-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-11-openjdk-amd64
stage-snaps:
- charmed-zookeeper/3/edge
override-build: |
ln -s /usr/lib/jvm/java-18-openjdk-amd64/bin/java \
ln -s /usr/lib/jvm/java-11-openjdk-amd64/bin/java \
$CRAFT_PART_INSTALL/usr/bin/java
ln -s /usr/lib/jvm/java-18-openjdk-amd64/bin/keytool \
ln -s /usr/lib/jvm/java-11-openjdk-amd64/bin/keytool \
$CRAFT_PART_INSTALL/usr/bin/keytool

mkdir -p $CRAFT_PART_INSTALL/var/lib/pebble/default/
Expand All @@ -60,7 +60,7 @@ parts:
rm -rf $CRAFT_PART_INSTALL/opt/zookeeper/conf
override-prime: |
craftctl default
rm -vf usr/lib/jvm/java-18-openjdk-amd64/lib/security/cacerts
rm -vf usr/lib/jvm/java-11-openjdk-amd64/lib/security/cacerts
non-root-user:
plugin: nil
after: [zookeeper]
Expand Down
Loading