diff --git a/latest-versions.sh b/latest-versions.sh index d71ddf8..0e5c3c8 100755 --- a/latest-versions.sh +++ b/latest-versions.sh @@ -44,7 +44,7 @@ get_latest() { local current=$(cat "${dir}/Dockerfile" | grep -m 1 VERSION | awk '{print $(NF)}') - if [[ "$tag" =~ "$current" ]] || [[ "$name" =~ "$current" ]]; then + if [[ "$tag" =~ "$current" ]] || [[ "$name" =~ "$current" ]] || [[ "$current" =~ "$tag" ]]; then echo -e "\e[36m${dir}:\e[39m current ${current} | ${tag} | ${name}" else echo -e "\e[31m${dir}:\e[39m current ${current} | ${tag} | ${name} | https://github.com/${repo}/releases" diff --git a/vscode/Dockerfile b/vscode/Dockerfile index fc48440..7f8853f 100644 --- a/vscode/Dockerfile +++ b/vscode/Dockerfile @@ -13,6 +13,7 @@ FROM debian:stretch LABEL maintainer "Jessie Frazelle " RUN apt-get update && apt-get install -y \ + gnupg \ libasound2 \ libatk1.0-0 \ libcairo2 \ @@ -59,7 +60,6 @@ ENV CODE_COMMIT 6eaebe3b9c70406d67c97779468c324a7a95db0e RUN buildDeps=' \ ca-certificates \ curl \ - gnupg \ ' \ && set -x \ && apt-get update && apt-get install -y $buildDeps --no-install-recommends \ @@ -67,13 +67,12 @@ RUN buildDeps=' \ && apt-get update && apt-get install -y nodejs --no-install-recommends \ && rm -rf /var/lib/apt/lists/* \ && curl -sSL "https://az764295.vo.msecnd.net/stable/${CODE_COMMIT}/code_${CODE_VERSION}_amd64.deb" -o /tmp/vs.deb \ + && apt-get purge -y --auto-remove $buildDeps \ && dpkg -i /tmp/vs.deb \ - && rm -rf /tmp/vs.deb \ - && apt-get purge -y --auto-remove $buildDeps + && rm -rf /tmp/vs.deb COPY start.sh /usr/local/bin/start.sh -COPY local.conf /etc/fonts/local.conf WORKDIR $HOME -ENTRYPOINT [ "/usr/local/bin/start.sh" ] +CMD [ "start.sh" ] diff --git a/vscode/local.conf b/vscode/local.conf deleted file mode 100644 index f6a5f5c..0000000 --- a/vscode/local.conf +++ /dev/null @@ -1,34 +0,0 @@ - - - - - -rgb - - - - -true - - - - -hintslight - - - - -true - - - - -lcddefault - - - - -false - - - diff --git a/vscode/start.sh b/vscode/start.sh index 079d1d0..ebc17a1 100755 --- a/vscode/start.sh +++ b/vscode/start.sh @@ -2,5 +2,5 @@ set -e set -o pipefail -su user -c /usr/share/code/bin/code +su user -c /usr/bin/editor sleep infinity