Skip to content

Commit

Permalink
Rebase to 3.19
Browse files Browse the repository at this point in the history
  • Loading branch information
thespad committed Mar 20, 2024
1 parent 250bf91 commit ade849f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 34 deletions.
14 changes: 3 additions & 11 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:3.18
FROM ghcr.io/linuxserver/baseimage-alpine:3.19

# set version label
ARG BUILD_DATE
Expand All @@ -13,7 +13,7 @@ RUN \
apk add --no-cache \
libcap \
nss \
openjdk8-jre \
openjdk17-jre \
sqlite-libs && \
echo "**** install ha-bridge ****" && \
if [ -z ${HABRIDGE_RELEASE+x} ]; then \
Expand All @@ -24,15 +24,7 @@ RUN \
/app && \
curl -o \
/app/ha-bridge.jar -L \
"https://github.com/bwssytems/ha-bridge/releases/download/${HABRIDGE_RELEASE}/ha-bridge-${HABRIDGE_RELEASE:1}.jar" && \
echo "**** workaround to run habridge on port 80 as abc user ****" && \
setcap cap_net_bind_service=+epi /usr/lib/jvm/java-1.8-openjdk/bin/java && \
setcap cap_net_bind_service=+epi /usr/lib/jvm/java-1.8-openjdk/jre/bin/java && \
echo "**** make architecture agnostic symlinks of java libs ****" && \
find \
/usr/lib/jvm/java-1.8-openjdk/jre \
-type f \( -name "libjvm.so" -o -name "libjli.so" \) \
-exec ln -sf {} /usr/lib/ \;
"https://github.com/bwssytems/ha-bridge/releases/download/${HABRIDGE_RELEASE}/ha-bridge-${HABRIDGE_RELEASE:1}.jar"

# copy local files
COPY root/ /
Expand Down
14 changes: 3 additions & 11 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.19

# set version label
ARG BUILD_DATE
Expand All @@ -13,7 +13,7 @@ RUN \
apk add --no-cache \
libcap \
nss \
openjdk8-jre \
openjdk17-jre \
sqlite-libs && \
echo "**** install ha-bridge ****" && \
if [ -z ${HABRIDGE_RELEASE+x} ]; then \
Expand All @@ -24,15 +24,7 @@ RUN \
/app && \
curl -o \
/app/ha-bridge.jar -L \
"https://github.com/bwssytems/ha-bridge/releases/download/${HABRIDGE_RELEASE}/ha-bridge-${HABRIDGE_RELEASE:1}.jar" && \
echo "**** workaround to run habridge on port 80 as abc user ****" && \
setcap cap_net_bind_service=+epi /usr/lib/jvm/java-1.8-openjdk/bin/java && \
setcap cap_net_bind_service=+epi /usr/lib/jvm/java-1.8-openjdk/jre/bin/java && \
echo "**** make architecture agnostic symlinks of java libs ****" && \
find \
/usr/lib/jvm/java-1.8-openjdk/jre \
-type f \( -name "libjvm.so" -o -name "libjli.so" \) \
-exec ln -sf {} /usr/lib/ \;
"https://github.com/bwssytems/ha-bridge/releases/download/${HABRIDGE_RELEASE}/ha-bridge-${HABRIDGE_RELEASE:1}.jar"

# copy local files
COPY root/ /
Expand Down
16 changes: 4 additions & 12 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,24 +26,15 @@ param_container_name: "{{ project_name }}"
param_usage_include_net: false
param_usage_include_env: true
param_env_vars:
- {env_var: "SEC_KEY", env_value: "<Your Key To Encrypt Security Data>", desc: "Key used to secure communication."}
- {env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London."}
- {env_var: "SEC_KEY", env_value: "", desc: "Key used to secure communication."}
param_usage_include_vols: true
param_volumes:
- {vol_path: "/config", vol_host_path: "<path to data>", desc: "Where HABridge stores config files and data."}
- {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/config", desc: "Where HABridge stores config files and data."}
param_usage_include_ports: true
param_ports:
- {external_port: "8080", internal_port: "8080", port_desc: "WebUI"}
- {external_port: "50000", internal_port: "50000", port_desc: "HABridge communication port."}
param_device_map: false
cap_add_param: false
# optional container parameters
opt_param_usage_include_env: false
opt_param_usage_include_vols: false
opt_param_usage_include_ports: false
opt_param_device_map: false
opt_cap_add_param: false
optional_block_1: false

# application setup block
app_setup_block_enabled: true
app_setup_block: |
Expand All @@ -52,6 +43,7 @@ app_setup_block: |
For information on how to configure ha-bridge, go to their wiki at [https://github.com/bwssytems/ha-bridge/wiki](https://github.com/bwssytems/ha-bridge/wiki)
# changelog
changelogs:
- {date: "20.03.24:", desc: "Rebase to Alpine 3.19, bump JRE to 17."}
- {date: "25.08.23:", desc: "Rebase to Alpine 3.18."}
- {date: "07.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"}
- {date: "11.12.22:", desc: "Rebasing to alpine 3.17."}
Expand Down

0 comments on commit ade849f

Please sign in to comment.