Skip to content

Commit

Permalink
[DPE-3240] Rock image fail builds (#28)
Browse files Browse the repository at this point in the history
  • Loading branch information
deusebio authored Jan 22, 2024
1 parent 99d695b commit de42876
Showing 1 changed file with 11 additions and 11 deletions.
22 changes: 11 additions & 11 deletions rockcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,16 @@ platforms: # The platforms this ROCK should be built on and run on
amd64:

environment:
JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
ZOO_LOG_DIR: /var/log/zookeeper
ZOO_LOG4J_PROP: INFO,CONSOLE,ROLLINGFILE
ZOO_LOG_FILE: zookeeper.log
ZOOCFGDIR: /etc/zookeeper

services:
zookeeper:
override: replace
command: /bin/zkServer.sh --config /etc/zookeeper start-foreground
command: >
/opt/zookeeper/bin/zkServer.sh
--config /etc/zookeeper start-foreground
startup: enabled
user: zookeeper
group: zookeeper
Expand All @@ -36,17 +36,17 @@ parts:
zookeeper:
plugin: nil
stage-packages:
- openjdk-17-jre-headless
- openjdk-8-jre-headless
- libpsl5
- curl
build-environment:
- JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
- JAVA_HOME: /usr/lib/jvm/java-8-openjdk-amd64
stage-snaps:
- charmed-zookeeper/3/edge
override-build: |
ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/java \
ln -s /usr/lib/jvm/java-8-openjdk-amd64/bin/java \
$CRAFT_PART_INSTALL/usr/bin/java
ln -s /usr/lib/jvm/java-17-openjdk-amd64/bin/keytool \
ln -s /usr/lib/jvm/java-8-openjdk-amd64/bin/keytool \
$CRAFT_PART_INSTALL/usr/bin/keytool
mkdir -p $CRAFT_PART_INSTALL/var/lib/pebble/default/
Expand All @@ -55,12 +55,12 @@ parts:
mkdir -p $CRAFT_PART_INSTALL/opt/zookeeper/
mkdir -p $CRAFT_PART_INSTALL/etc/zookeeper/
cp $CRAFT_PART_INSTALL/conf/zoo_sample.cfg \
cp $CRAFT_PART_INSTALL/opt/zookeeper/conf/zoo_sample.cfg \
$CRAFT_PART_INSTALL/etc/zookeeper/zoo.cfg
rm -rf $CRAFT_PART_INSTALL/conf
rm -rf $CRAFT_PART_INSTALL/opt/zookeeper/conf
override-prime: |
craftctl default
rm -vf usr/lib/jvm/java-17-openjdk-amd64/lib/security/cacerts
rm -vf usr/lib/jvm/java-8-openjdk-amd64/lib/security/cacerts
non-root-user:
plugin: nil
after: [zookeeper]
Expand Down

0 comments on commit de42876

Please sign in to comment.