From 4cee6fa1d542c5410ddc2d09fc4a4187ffbc8115 Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Thu, 13 Jan 2022 22:22:28 +0100 Subject: [PATCH] Update Dockerfile --- code-server/Dockerfile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code-server/Dockerfile b/code-server/Dockerfile index ffc0a90d0..354a4c6d3 100644 --- a/code-server/Dockerfile +++ b/code-server/Dockerfile @@ -37,17 +37,6 @@ RUN \ # Add rootfs COPY rootfs/ / -# Manual apps -ENV PACKAGES="jq" - -# Automatic apps & bashio -RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \ - if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \ - curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \ - chmod 777 /automatic_packages.sh && \ - /automatic_packages.sh "${PACKAGES:-}" && \ - rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE - # Modules ARG MODULES="00-banner.sh 92-local_mounts.sh 92-smb_mounts.sh" @@ -60,6 +49,17 @@ RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get     if [ -d /scripts ]; then /bin/cp -rf /tmpscripts/* /scripts/ && chmod -R 755 /scripts; fi && \     rm -rf /tmpscripts || printf '%s\n' "${MODULES:-}" > /MODULESFILE +# Manual apps +ENV PACKAGES="jq" + +# Automatic apps & bashio +RUN if ! command -v bash >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends bash || apk add --no-cache bash); fi && \ + if ! command -v curl >/dev/null 2>/dev/null; then (apt-get update && apt-get install -yqq --no-install-recommends curl || apk add --no-cache curl); fi && \ + curl -L -f -s "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/zzz_templates/automatic_packages.sh" --output /automatic_packages.sh && \ + chmod 777 /automatic_packages.sh && \ + /automatic_packages.sh "${PACKAGES:-}" && \ + rm /automatic_packages.sh || printf '%s\n' "${PACKAGES:-}" > /ENVFILE + ################ # 4 Entrypoint # ################