⬆️ Upgrades add-on base image to v4.2.0 (#32)

* ⬆️ Upgrades add-on base image to v4.2.0

* Fix shellcheck warning
This commit is contained in:
Franck Nijhof 2021-05-04 20:59:59 +02:00 committed by GitHub
parent e282ab5024
commit e9f4344ddc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 8 deletions

View file

@ -1,4 +1,4 @@
ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.1.0
ARG BUILD_FROM=ghcr.io/hassio-addons/debian-base/amd64:4.2.0
# hadolint ignore=DL3006
FROM ${BUILD_FROM}
@ -29,7 +29,7 @@ RUN \
build-essential=12.6 \
colordiff=1.0.18-1 \
git=1:2.20.1-2+deb10u3 \
iputils-ping=3:20180629-2+deb10u1 \
iputils-ping=3:20180629-2+deb10u2 \
locales=2.28-10 \
mariadb-client=1:10.3.27-0+deb10u1 \
mosquitto-clients=1.5.7-1+deb10u1 \
@ -37,7 +37,7 @@ RUN \
nmap=7.70+dfsg1-6+deb10u1 \
openssh-client=1:7.9p1-10+deb10u2 \
openssh-server=1:7.9p1-10+deb10u2 \
openssl=1.1.1d-0+deb10u4 \
openssl=1.1.1d-0+deb10u6 \
pwgen=2.08-1 \
python3-dev=3.7.3-1 \
python3=3.7.3-1 \

View file

@ -1,9 +1,9 @@
{
"build_from": {
"aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.1.0",
"amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.1.0",
"armhf": "ghcr.io/hassio-addons/debian-base/armhf:4.1.0",
"armv7": "ghcr.io/hassio-addons/debian-base/armv7:4.1.0",
"i386": "ghcr.io/hassio-addons/debian-base/i386:4.1.0"
"aarch64": "ghcr.io/hassio-addons/debian-base/aarch64:4.2.0",
"amd64": "ghcr.io/hassio-addons/debian-base/amd64:4.2.0",
"armhf": "ghcr.io/hassio-addons/debian-base/armhf:4.2.0",
"armv7": "ghcr.io/hassio-addons/debian-base/armv7:4.2.0",
"i386": "ghcr.io/hassio-addons/debian-base/i386:4.2.0"
}
}

View file

@ -3,11 +3,19 @@
# Home Assistant Community Add-on: VSCode Remote
# Persists user settings and installs custom user packages.
# ==============================================================================
readonly -a DIRECTORIES=(addons backup config share ssl)
readonly GIT_USER_PATH=/data/git
readonly HOME_ASSISTANT_PROFILE_D_FILE=/etc/profile.d/homeassistant.sh
readonly SSH_USER_PATH=/data/.ssh
readonly ZSH_HISTORY_FILE=/root/.zsh_history
readonly ZSH_HISTORY_PERSISTANT_FILE=/data/.zsh_history
# Links some common directories to the user's home folder for convenience
for dir in "${DIRECTORIES[@]}"; do
ln -s "/${dir}" "${HOME}/${dir}" \
|| bashio::log.warning "Failed linking common directory: ${dir}"
done
# Store SSH settings in add-on data folder
if ! bashio::fs.directory_exists "${SSH_USER_PATH}"; then
mkdir -p "${SSH_USER_PATH}" \
@ -30,6 +38,10 @@ chmod 600 "$ZSH_HISTORY_PERSISTANT_FILE" \
ln -s -f "$ZSH_HISTORY_PERSISTANT_FILE" "$ZSH_HISTORY_FILE" \
|| bashio::exit.nok 'Failed linking the persistant ZSH history file'
sed -i "1iexport SUPERVISOR_TOKEN=\"${SUPERVISOR_TOKEN}\"" \
"${HOME_ASSISTANT_PROFILE_D_FILE}" \
|| bashio::exit.nok 'Failed to export Supervisor API token'
# Store user GIT settings in add-on data folder
if ! bashio::fs.directory_exists "${GIT_USER_PATH}"; then
mkdir -p "${GIT_USER_PATH}" \

View file

@ -0,0 +1,2 @@
export HASS_SERVER="http://supervisor/core"
export HASS_TOKEN="${SUPERVISOR_TOKEN:-}"

View file

@ -63,6 +63,7 @@ plugins=(
zsh-syntax-highlighting
)
# shellcheck disable=SC1091
source $ZSH/oh-my-zsh.sh
# User configuration