From 03a87dd1a9c556e34d5b3f3aa62f69a8e6d54248 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Josai?= Date: Sat, 18 Jun 2022 16:20:23 +0200 Subject: [PATCH] Small fixes and getting ready to build --- .devcontainer.json | 25 +++++++++++++++++++++++++ .vscode/tasks.json | 20 ++++++++++++++++++++ cups/Dockerfile | 4 ++-- cups/config.json | 2 +- 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 .devcontainer.json create mode 100644 .vscode/tasks.json diff --git a/.devcontainer.json b/.devcontainer.json new file mode 100644 index 0000000..bb14fff --- /dev/null +++ b/.devcontainer.json @@ -0,0 +1,25 @@ +{ + "name": "Example devcontainer for add-on repositories", + "image": "ghcr.io/home-assistant/devcontainer:addons", + "appPort": ["7123:8123", "7357:4357"], + "postStartCommand": "bash devcontainer_bootstrap", + "runArgs": ["-e", "GIT_EDITOR=code --wait", "--privileged"], + "containerEnv": { + "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}" + }, + "extensions": ["timonwong.shellcheck", "esbenp.prettier-vscode"], + "mounts": [ "type=volume,target=/var/lib/docker" ], + "settings": { + "terminal.integrated.profiles.linux": { + "zsh": { + "path": "/usr/bin/zsh" + } + }, + "terminal.integrated.defaultProfile.linux": "zsh", + "editor.formatOnPaste": false, + "editor.formatOnSave": true, + "editor.formatOnType": true, + "files.trimTrailingWhitespace": true + } + } + \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..36e373a --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,20 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Start Home Assistant", + "type": "shell", + "command": "supervisor_run", + "group": { + "kind": "test", + "isDefault": true + }, + "presentation": { + "reveal": "always", + "panel": "new" + }, + "problemMatcher": [] + } + ] + } + \ No newline at end of file diff --git a/cups/Dockerfile b/cups/Dockerfile index 3fce05e..6cde750 100644 --- a/cups/Dockerfile +++ b/cups/Dockerfile @@ -21,7 +21,7 @@ RUN apt-get update \ lsb-release \ nano \ samba \ - bash-autocompletion \ + bash-completion \ && echo "deb http://nginx.org/packages/debian `lsb_release -cs` nginx" \ | tee /etc/apt/sources.list.d/nginx.list \ && curl -fsSL https://nginx.org/keys/nginx_signing.key | apt-key add - \ @@ -32,6 +32,6 @@ RUN apt-get update \ COPY rootfs / -EXPOSE 631 445 +EXPOSE 631 445 137 139 CMD ["/run.sh"] diff --git a/cups/config.json b/cups/config.json index f54377e..174db69 100644 --- a/cups/config.json +++ b/cups/config.json @@ -1,6 +1,6 @@ { "name": "CUPS Print Server", - "version": "1.0.0-alpha.26", + "version": "1.0.0-alpha.25", "slug": "cups", "description": "A CUPS print server with Avahi installed", "url": "https://github.com/Luk164/addon-repository",