diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index b25d2d9ae8..0000000000 --- a/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -node_modules -hass_frontend -hass_frontend_es5 -.git diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 826041fced..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,31 +0,0 @@ -FROM node:8.11.1-alpine - -# install yarn -ENV PATH /root/.yarn/bin:$PATH - -## Install/force base tools -RUN apk update \ - && apk add make g++ curl bash binutils tar git python2 python3 \ - && rm -rf /var/cache/apk/* \ - && /bin/bash \ - && touch ~/.bashrc - -## Install yarn -RUN curl -o- -L https://yarnpkg.com/install.sh | bash - -## Setup the project -RUN mkdir -p /frontend - -WORKDIR /frontend - -COPY package.json yarn.lock ./ - -RUN yarn install --frozen-lockfile - -COPY . . - -COPY script/docker_entrypoint.sh /usr/bin/docker_entrypoint.sh - -RUN chmod +x /usr/bin/docker_entrypoint.sh - -CMD [ "docker_entrypoint.sh" ] diff --git a/README.md b/README.md index ab25dde882..c5b6edde12 100644 --- a/README.md +++ b/README.md @@ -22,15 +22,6 @@ This is the repository for the official [Home Assistant](https://home-assistant. A complete guide can be found at the following [link](https://www.home-assistant.io/developers/frontend/). It describes a short guide for the build of project. -### Docker environment - -It is possible to compile the project and/or run commands in the development environment having only the [Docker](https://www.docker.com) pre-installed in the system. On the root of project you can do: - -- `sh ./script/docker_run.sh build` Build all the project with one command -- `sh ./script/docker_run.sh bash` Open an interactive shell (the same environment generated by the _classic environment_) where you can run commands. This bash work on your project directory and any change on your file is automatically present within your build bash. - -**Note**: if you have installed `npm` in addition to the `docker`, you can use the commands `npm run docker_build` and `npm run bash` to get a full build or bash as explained above - ## License Home Assistant is open-source and Apache 2 licensed. Feel free to browse the repository, learn and reuse parts in your own projects. diff --git a/package.json b/package.json index 32f5d1fe8d..43658529fa 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,7 @@ "lint": "npm run lint:eslint && npm run lint:prettier && npm run lint:types", "format": "npm run format:eslint && npm run format:prettier", "mocha": "node_modules/.bin/ts-mocha -p test-mocha/tsconfig.test.json --opts test-mocha/mocha.opts", - "test": "npm run lint && npm run mocha", - "docker_build": "sh ./script/docker_run.sh build $npm_package_version", - "bash": "sh ./script/docker_run.sh bash $npm_package_version" + "test": "npm run lint && npm run mocha" }, "author": "Paulus Schoutsen (http://paulusschoutsen.nl)", "license": "Apache-2.0", diff --git a/script/docker_entrypoint.sh b/script/docker_entrypoint.sh deleted file mode 100644 index 9d7d228bfc..0000000000 --- a/script/docker_entrypoint.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash -# Docker entry point inspired by travis build and script/build_frontend - -# Stop on errors -set -e - -# Build the frontend but not used the npm run build -/bin/bash script/build_frontend - -# TEST -npm run test - -# -#xvfb-run wct diff --git a/script/docker_run.sh b/script/docker_run.sh deleted file mode 100755 index 8ee7abe474..0000000000 --- a/script/docker_run.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/bash -# Basic Docker Management scripts -# With this script you can build software, or enter an agnostic development environment and run commands interactively. - - - -check_mandatory_tools(){ - if [ "x$(which docker)" == "x" ]; then - echo "UNKNOWN - Missing docker binary! Are you sure it is installed and reachable?" - exit 3 - fi - - docker info > /dev/null 2>&1 - if [ $? -ne 0 ]; then - echo "UNKNOWN - Unable to talk to the docker daemon! Maybe the docker daemon is not running" - exit 3 - fi -} - -check_dev_image(){ - if [[ "$(docker images -q ${IMAGE_NAME}:$IMAGE_TAG 2> /dev/null)" == "" ]]; then - echo "UNKNOWN - Can't find the development docker image ${IMAGE_NAME}:$IMAGE_TAG" - while true; do - read -p "Do you want to create it now?" yn - case $yn in - [Yy]* ) create_image; break;; - [Nn]* ) exit 3;; - * ) echo "Please answer y or n";; - esac - done - fi -} - -# Building the basic image for compiling the production frontend -create_image(){ - docker build -t ${IMAGE_NAME}:${IMAGE_TAG} . -} - -# -# Execute interactive bash on basic image -# -run_bash_on_docker(){ - - check_dev_image - - docker run -it \ - -v $PWD/:/frontend/ \ - -v /frontend/node_modules \ - -v /frontend/bower_components \ - ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash -} - -# -# Execute the basic image for compiling the production frontend -# -build_all(){ - - check_dev_image - - docker run -it \ - -v $PWD/:/frontend/ \ - -v /frontend/node_modules \ - -v /frontend/bower_components \ - ${IMAGE_NAME}:${IMAGE_TAG} /bin/bash script/build_frontend - -} - -# Init Global Variable -IMAGE_NAME=home_assistant_fe_image -IMAGE_TAG=${2:-latest} - -check_mandatory_tools - -case "$1" in - setup_env) - create_image - ;; - bash) - run_bash_on_docker - ;; - build) - build_all - ;; - *) - echo "NAME" - echo " Docker Management." - echo "" - echo "SYNOPSIS" - echo " ${0} command [version]" - echo "" - echo "DESCRIPTION" - echo " With this script you can build software, or enter an agnostic development environment and run commands interactively." - echo "" - echo " The command are:" - echo " setup_env Create develop images" - echo " bash Run bash on develop enviroments" - echo " build Run silent build" - echo "" - echo " The version is optional, if not inserted it assumes \"latest\". " - exit 1 - ;; -esac -exit 0