Update build scripts

.github/workflows/release-dev.yml

@@ -7,12 +7,12 @@ on:
 
 jobs:
   # THE LINT/TEST JOBS ARE COPIED FROM ci.yaml
- 
+
   lint-clang-format:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     steps:
       - uses: actions/checkout@v2
       # Cache platformio intermediary files (like libraries etc)
@@ -38,7 +38,7 @@ jobs:
     runs-on: ubuntu-latest
     # cpp lint job runs with esphome-lint docker image so that clang-format-*
     # doesn't have to be installed
-    container: esphome/esphome-lint:dev
+    container: esphome/esphome-lint:latest
     # Split clang-tidy check into 4 jobs. Each one will check 1/4th of the .cpp files
     strategy:
       matrix:
@@ -59,7 +59,7 @@ jobs:
       - name: Set up platformio environment
         run: pio init --ide atom
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/clang-tidy.json"
@@ -141,7 +141,7 @@ jobs:
       - name: Set up environment
         run: script/setup
 
-      
+
       - name: Register problem matchers
         run: |
           echo "::add-matcher::.github/workflows/matchers/gcc.json"
@@ -158,45 +158,54 @@ jobs:
         build_type: ["hassio", "docker"]
     steps:
       - uses: actions/checkout@v2
+      - name: Set TAG
+        run: |
+          TAG="${GITHUB_SHA:0:7}"
+          echo "::set-env name=TAG::${TAG}"
       - name: Set up env variables
         run: |
-          tag="dev"
-          base_version="2.1.2"
+          base_version="2.3.1"
 
           if [[ "${{ matrix.build_type }}" == "hassio" ]]; then
             build_from="esphome/esphome-hassio-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-hassio-${{ matrix.arch }}"
+            build_to="esphome/esphome-hassio-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile.hassio"
           else
             build_from="esphome/esphome-base-${{ matrix.arch }}:${base_version}"
-            build_to="${{ github.repository }}-${{ matrix.arch }}"
+            build_to="esphome/esphome-${{ matrix.arch }}"
             dockerfile="docker/Dockerfile"
           fi
 
-          # Set env variables so these values don't need to be calculated again
-          echo "::set-env name=TAG::${tag}"
           echo "::set-env name=BUILD_FROM::${build_from}"
           echo "::set-env name=BUILD_TO::${build_to}"
-          echo "::set-env name=IMAGE::${build_to}:${tag}"
           echo "::set-env name=DOCKERFILE::${dockerfile}"
+      - name: Pull for cache
+        run: |
+          docker pull "${BUILD_TO}:latest" || true
+          docker pull "${BUILD_TO}:beta" || true
+          docker pull "${BUILD_TO}:dev" || true
       - name: Register QEMU binfmt
         run: docker run --rm --privileged multiarch/qemu-user-static:5.0.0-2 --reset -p yes
       - run: |
           docker build \
             --build-arg "BUILD_FROM=${BUILD_FROM}" \
             --build-arg "BUILD_VERSION=${TAG}" \
-            --tag "${IMAGE}" \
+            --tag "${BUILD_TO}:${TAG}" \
+            --tag "${BUILD_TO}:dev" \
+            --cache-from "${BUILD_TO}:latest" \
+            --cache-from "${BUILD_TO}:beta" \
+            --cache-from "${BUILD_TO}:dev" \
             --file "${DOCKERFILE}" \
-            --cache-from "${{ github.repository }}:latest" \
-            --cache-from "${{ github.repository }}:beta" \
-            --cache-from "${{ github.repository }}:dev" \
             .
       - name: Log in to docker hub
         env:
           DOCKER_USER: ${{ secrets.DOCKER_USER }}
           DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
         run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
-      - run: docker push "${IMAGE}"
+      - run: |
+          docker push "${BUILD_TO}:${TAG}"
+          docker push "${BUILD_TO}:dev"
+
 
   deploy-docker-manifest:
     runs-on: ubuntu-latest
@@ -206,6 +215,10 @@ jobs:
       run: |
         mkdir -p ~/.docker
         echo "{\"experimental\": \"enabled\"}" > ~/.docker/config.json
+    - name: Set TAG
+      run: |
+        TAG="${GITHUB_SHA:0:7}"
+        echo "::set-env name=TAG::${TAG}"
     - name: Log in to docker hub
       env:
         DOCKER_USER: ${{ secrets.DOCKER_USER }}
@@ -213,12 +226,16 @@ jobs:
       run: docker login -u "${DOCKER_USER}" -p "${DOCKER_PASSWORD}"
     - name: "Create the manifest"
       run: |
-        REPO=${{ github.repository }}
-        TAG="dev"
+        docker manifest create esphome/esphome:${TAG} \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:${TAG}
 
-        docker manifest create ${REPO}:${TAG} \
-          ${REPO}-aarch64:${TAG} \
-          ${REPO}-amd64:${TAG} \
-          ${REPO}-armv7:${TAG} \
-          ${REPO}-i386:${TAG}
-        docker manifest push ${REPO}:${TAG}
+        docker manifest create esphome/esphome:dev \
+          esphome/esphome-aarch64:${TAG} \
+          esphome/esphome-amd64:${TAG} \
+          esphome/esphome-armv7:${TAG} \
+          esphome/esphome-i386:${TAG}
+        docker manifest push esphome/esphome:dev